Skip to content

Commit 79df5b9

Browse files
authored
use PyMieScatt from repo instead of PyPI; add P3.13 to macOS CI (#386)
1 parent 6b412ca commit 79df5b9

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

.binder/requirements.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ matplotlib
33
ipywidgets
44
voila
55
open-atmos-jupyter-utils
6+
numba>=0.61.0rc1; python_version >= '3.13'
67
PySDM
7-
PyMieScatt
8-
SciPy<1.14.0
8+
git+https://github.com/bsumlin/PyMieScatt.git
9+
SciPy

.github/workflows/tests+pypi.yml

+2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ jobs:
5959
python-version: "3.11"
6060
- platform: macos-13
6161
python-version: "3.12"
62+
- platform: macos-13
63+
python-version: "3.13"
6264
- platform: macos-14
6365
python-version: "3.10"
6466
- platform: macos-14

examples/mie_optical.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
"if \"google.colab\" in sys.modules:\n",
3838
" !pip --quiet install open-atmos-jupyter-utils\n",
3939
" from open_atmos_jupyter_utils import pip_install_on_colab\n",
40-
" pip_install_on_colab('PyPartMC', 'PyMieScatt')\n",
40+
" pip_install_on_colab('PyPartMC', 'git+https://github.com/bsumlin/PyMieScatt.git')\n",
4141
"elif 'JUPYTER_IMAGE' in os.environ and '.arm.gov' in os.environ['JUPYTER_IMAGE']:\n",
42-
" !pip --quiet install PyPartMC PyMieScatt open_atmos_jupyter_utils\n",
42+
" !pip --quiet install PyPartMC git+https://github.com/bsumlin/PyMieScatt.git open_atmos_jupyter_utils\n",
4343
" _pypartmc_path = !pip show PyPartMC | fgrep Location | cut -f2 -d' '\n",
4444
" sys.path.extend(_pypartmc_path if _pypartmc_path[0] not in sys.path else [])"
4545
]

setup.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ def build_extension(self, ext): # pylint: disable=too-many-branches
153153
"pytest-order",
154154
"fastcore!=1.5.8", # https://github.com/fastai/fastcore/issues/439
155155
"ghapi",
156-
# https://github.com/bsumlin/PyMieScatt/issues/25
157-
"scipy" + ("<1.14.0" if "CI" in os.environ else ""),
156+
"scipy",
158157
]
159158
},
160159
)

0 commit comments

Comments
 (0)