use PyMieScatt from repo instead of PyPI; add P3.13 to macOS CI;

open-atmos · Dec 6, 2024 · 463737a · 463737a
1 parent 6b412ca
commit 463737a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/.binder/requirements.txt b/.binder/requirements.txt
@@ -4,5 +4,5 @@ ipywidgets
 voila
 open-atmos-jupyter-utils
 PySDM
-PyMieScatt
-SciPy<1.14.0
+git+https://github.com/bsumlin/PyMieScatt.git
+SciPy
diff --git a/.github/workflows/tests+pypi.yml b/.github/workflows/tests+pypi.yml
@@ -59,12 +59,16 @@ jobs:
             python-version: "3.11"
           - platform: macos-13
             python-version: "3.12"
+          - platform: macos-13
+            python-version: "3.13"
           - platform: macos-14
             python-version: "3.10"
           - platform: macos-14
             python-version: "3.11"
           - platform: macos-14
             python-version: "3.12"
+          - platform: macos-14
+            python-version: "3.13"
           - manylinux: "manylinux2010_x86_64"
             platform: ubuntu-latest
             python-version: "3.8"

diff --git a/examples/mie_optical.ipynb b/examples/mie_optical.ipynb
@@ -37,9 +37,9 @@
     "if \"google.colab\" in sys.modules:\n",
     "    !pip --quiet install open-atmos-jupyter-utils\n",
     "    from open_atmos_jupyter_utils import pip_install_on_colab\n",
-    "    pip_install_on_colab('PyPartMC', 'PyMieScatt')\n",
+    "    pip_install_on_colab('PyPartMC', 'git+https://github.com/bsumlin/PyMieScatt.git')\n",
     "elif 'JUPYTER_IMAGE' in os.environ and '.arm.gov' in os.environ['JUPYTER_IMAGE']:\n",
-    "    !pip --quiet install PyPartMC PyMieScatt open_atmos_jupyter_utils\n",
+    "    !pip --quiet install PyPartMC git+https://github.com/bsumlin/PyMieScatt.git open_atmos_jupyter_utils\n",
     "    _pypartmc_path = !pip show PyPartMC | fgrep Location | cut -f2 -d' '\n",
     "    sys.path.extend(_pypartmc_path if _pypartmc_path[0] not in sys.path else [])"
    ]

diff --git a/gitmodules/partmc b/gitmodules/partmc
diff --git a/setup.py b/setup.py
@@ -153,8 +153,7 @@ def build_extension(self, ext):  # pylint: disable=too-many-branches
             "pytest-order",
             "fastcore!=1.5.8",  # https://github.com/fastai/fastcore/issues/439
             "ghapi",
-            # https://github.com/bsumlin/PyMieScatt/issues/25
-            "scipy" + ("<1.14.0" if "CI" in os.environ else ""),
+            "scipy",
         ]
     },
 )
+0 −1		CMakeLists.txt
+0 −3		src/coag_kernel.F90
+8 −6		src/coag_kernel_additive.F90
+1 −6		src/env_state.F90
+0 −1		src/partmc.F90
+0 −4		src/run_exact.F90
+0 −4		src/run_part.F90
+0 −4		src/run_sect.F90
+0 −1		test/additive/run_exact.spec
+0 −1		test/additive/run_part.spec