PySDM 2.78__tar.gz → 2.79__tar.gz

{PySDM-2.78 → PySDM-2.79}/.github/workflows/readme_snippets.yml

@@ -20,28 +20,16 @@ jobs:
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v4.1.6
-      - if: matrix.platform != 'macos-14'
-        uses: actions/setup-python@v5.0.0
+      - uses: actions/setup-python@v5.0.0
         with:
-          python-version: 3.9
-      - if: matrix.platform == 'macos-14'
-        run: |
-          sudo ln -s `which python3` /usr/local/bin/python
-          echo "PIP_INSTALL_ARGS=--break-system-packages" >> $GITHUB_ENV
-          python -m pip install --break-system-packages setuptools packaging # Python 3.12 workaround  
+          python-version: "3.10"
       - run: python -m pip install $PIP_INSTALL_ARGS -e .
       - run: python -m pip install $PIP_INSTALL_ARGS pytest-codeblocks pytest
       - run: python -m pip install $PIP_INSTALL_ARGS "pyparsing<3.0.0"  # https://github.com/matplotlib/matplotlib/issues/25204
       - run: |
           python -c "import os,pytest_codeblocks; code=pytest_codeblocks.extract_from_file('README.md'); f=open('readme.py', 'w', encoding='utf-8'); f.write('# coding: utf-8'+os.linesep); f.writelines(block.code for block in code if block.syntax=='Python'); f.close()"
       - run: cat -n readme.py
-      - if: matrix.platform == 'macos-14'
-        run: |
-          python readme.py
-          sed -i -e 's/CPU/GPU/g' readme.py
-          python readme.py
-      - if: matrix.platform != 'macos-14'
-        run: |
+      - run: |
           python -We readme.py
           sed -i -e 's/CPU/GPU/g' readme.py
           python -We readme.py
@@ -60,7 +48,7 @@ jobs:
       - uses: actions/checkout@v4.1.6
       - uses: actions/setup-python@v5.0.0
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - run: pip install -e .
       - run: pip install pytest-codeblocks pytest
       - run: python -c "import pytest_codeblocks; code=pytest_codeblocks.extract_from_file('README.md'); f=open('readme.jl', 'w'); f.writelines(block.code for block in code if block.syntax=='Julia'); f.close()"

{PySDM-2.78 → PySDM-2.79}/.github/workflows/tests+artifacts+pypi.yml

@@ -40,7 +40,7 @@ jobs:
       with:
         submodules: recursive
         fetch-depth: 0
-    - uses: actions/setup-python@master
+    - uses: actions/setup-python@v5.0.0
       with:
         python-version: 3.9
     - name: Generate coverage report
@@ -86,7 +86,7 @@ jobs:
     - uses: actions/checkout@v4.1.6
       with:
         submodules: recursive
-        fetch-depth: 0 
+        fetch-depth: 0
     - name: Set up Python 3.9
       uses: actions/setup-python@v5.0.0
       with:
@@ -114,7 +114,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.6
       - uses: notiz-dev/github-action-json-property@release
-        with: 
+        with:
           path: '.zenodo.json'
           prop_path: 'creators'
 
@@ -122,12 +122,23 @@ jobs:
     needs: [pdoc, nojit_and_codecov, zenodo_json]
     strategy:
       matrix:
-        platform: [ubuntu-latest, macos-12, windows-latest]
+        platform: [ubuntu-latest, macos-12, macos-14, windows-latest]
         python-version: ["3.9", "3.11"]
         test-suite: ["unit_tests/!(dynamics)", "unit_tests/dynamics/!(condensation)", "unit_tests/dynamics/condensation", "smoke_tests/no_env", "smoke_tests/box", "smoke_tests/parcel_a", "smoke_tests/parcel_b", "smoke_tests/parcel_c", "smoke_tests/kinematic_1d", "smoke_tests/kinematic_2d", "tutorials_tests"]
         exclude:
+          - platform: "macos-14"
+            python-version: "3.9"
           - test-suite: "devops_tests"
             python-version: "3.9"
+          # TODO #1406
+          - platform: "macos-14"
+            test-suite: "smoke_tests/box"
+          - platform: "macos-14"
+            test-suite: "smoke_tests/parcel_a"
+          - platform: "macos-14"
+            test-suite: "smoke_tests/kinematic_2d"
+          - platform: "macos-14"
+            test-suite: "unit_tests/!(dynamics)"
       fail-fast: false
     runs-on: ${{ matrix.platform }}
     timeout-minutes: ${{ startsWith(matrix.platform, 'windows-') && 40 || 25 }}
@@ -148,11 +159,13 @@ jobs:
       - if: startsWith(matrix.test-suite, 'smoke_tests') || matrix.test-suite == 'tutorials_tests'
         run: pip install -e ./examples
 
-      - run: pip install -e .[tests] # incl. ensuring that the previous pip did not overwrite the package
+      # incl. ensuring that the previous pip did not overwrite the package
+      - run: |
+          pip install --only-binary :all: -e .[tests]
 
       # install devops_tests for tutorials_tests
       - if: matrix.test-suite == 'tutorials_tests'
-        run: pip install -r tests/devops_tests/requirements.txt 
+        run: pip install -r tests/devops_tests/requirements.txt
 
       # https://github.com/numba/numba/issues/6350#issuecomment-728174860
       - if: startsWith(matrix.platform, 'ubuntu-')
@@ -175,7 +188,7 @@ jobs:
     needs: [nojit_and_codecov]
     strategy:
       matrix:
-        platform: [ubuntu-22.04, macos-12, windows-latest]
+        platform: [ubuntu-24.04, macos-12, windows-latest]
         python-version: ["3.9", "3.11"]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -183,7 +196,7 @@ jobs:
         with:
           submodules: recursive
           fetch-depth: 0
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v5.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - run: |
@@ -211,7 +224,7 @@ jobs:
     needs: [examples-setup]
     strategy:
       matrix:
-        platform: [ubuntu-22.04, macos-12, windows-latest]
+        platform: [ubuntu-24.04, macos-12, windows-latest]
         python-version: ["3.9", "3.11"]
         test-suite: [ "chemistry_freezing_isotopes", "condensation_a", "condensation_b", "coagulation", "breakup", "multi-process_a", "multi-process_b"]
       fail-fast: false
@@ -242,16 +255,28 @@ jobs:
       - if: startsWith(matrix.platform, 'ubuntu-')
         run: echo NUMBA_THREADING_LAYER=omp >> $GITHUB_ENV
 
-      - if: startsWith(matrix.platform, 'ubuntu-')
+      - if: startsWith(matrix.platform, 'ubuntu-') && matrix.test-suite == 'multi-process_a'
         run: |
-          sudo apt-get update
-          sudo apt-get install python3-paraview
-      - if: startsWith(matrix.platform, 'macos-')
+          sudo apt-get install libegl1 libopengl0 ghostscript
+          wget -nv "https://paraview.org/paraview-downloads/download.php?submit=Download&version=v5.13&type=binary&os=Linux&downloadFile=ParaView-5.13.1-egl-MPI-Linux-Python3.10-x86_64.tar.gz" -O paraview.tar.gz
+          tar xzf paraview.tar.gz
+          echo `pwd`/`dirname ParaView*/bin/pvpython` >> $GITHUB_PATH
+          
+      - if: startsWith(matrix.platform, 'macos-') && matrix.test-suite == 'multi-process_a'
         run: |
           brew install --cask paraview
           echo `dirname /Applications/ParaView-*.app/Contents/bin/pvpython | head -1` >> $GITHUB_PATH
-      - if: matrix.platform != 'windows-latest'
-        run: pvpython --version
+
+      - if: startsWith(matrix.platform, 'windows-') && matrix.test-suite == 'multi-process_a'
+        run: |
+          curl "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v5.13&type=binary&os=Windows&downloadFile=ParaView-5.13.1-Windows-Python3.10-msvc2017-AMD64.msi" -o paraview.msi
+          msiexec //i paraview.msi //quiet //qn //norestart 
+          echo "C:\\Program Files\\ParaView 5.13.1\\bin\\" >> $GITHUB_PATH
+
+      - if: matrix.test-suite == 'multi-process_a'
+        run: |
+          pvpython --version
+          pvpython -c "from paraview import simple"
 
       - env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -266,7 +291,7 @@ jobs:
         with:
           submodules: recursive
           fetch-depth: 0  # https://github.com/pypa/setuptools_scm/issues/480
-      - run: pip install -r tests/devops_tests/requirements.txt
+      - run: pip install -r tests/devops_tests/requirements.txt "flexparser<0.4"
       - env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: pytest --durations=10 -v -s -We -p no:unraisableexception -k "not test_run_notebooks" tests/devops_tests
@@ -304,36 +329,21 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest, macos-12, macos-14, windows-latest]
-        python-version: ["3.9", "3.11", "system"]
+        python-version: ["3.9", "3.11"]
         exclude:
-          - platform: ubuntu-latest
-            python-version: system
-          - platform: macos-12
-            python-version: system
-          - platform: windows-latest
-            python-version: system
           - platform: macos-14
             python-version: "3.9"
-          - platform: macos-14
-            python-version: "3.11"
     runs-on: ${{ matrix.platform }}
     needs: [package]
     steps:
-      - if: matrix.platform != 'macos-14'
-        uses: actions/setup-python@v5.0.0
+      - uses: actions/setup-python@v5.0.0
         with:
           python-version: ${{ matrix.python-version }}
-      - if: matrix.platform == 'macos-14'
-        run: |
-          sudo ln -s `which python3` /usr/local/bin/python
-          echo "PIP_INSTALL_ARGS=--break-system-packages" >> $GITHUB_ENV
-          # Python 3.12 workaround  
-          python -m pip install --break-system-packages setuptools packaging
       - uses: actions/download-artifact@v4
         with:
           pattern: dist-*
           merge-multiple: true
-          path: dist     
+          path: dist
       - run: python -m pip install $PIP_INSTALL_ARGS dist/*.whl
       - run: python -c "import PySDM; print(PySDM.__version__)"
       - run: python -c "import PySDM_examples; print(PySDM_examples.__version__)"
@@ -351,12 +361,14 @@ jobs:
           path: dist
 
       - if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        uses: pypa/gh-action-pypi-publish@unstable/v1
+        uses: pypa/gh-action-pypi-publish@release/v1.12
         with:
+          attestations: false
           repository_url: https://test.pypi.org/legacy/
           packages-dir: dist
 
       - if: startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@unstable/v1
+        uses: pypa/gh-action-pypi-publish@release/v1.12
         with:
+          attestations: false
           packages-dir: dist

{PySDM-2.78 → PySDM-2.79}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM
-Version: 2.78
+Version: 2.79
 Summary: Pythonic particle-based (super-droplet) warm-rain/aqueous-chemistry cloud microphysics package with box, parcel & 1D/2D prescribed-flow examples in Python, Julia and Matlab
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors

{PySDM-2.78 → PySDM-2.79}/PySDM/backends/numba.py

@@ -43,9 +43,10 @@ class Numba(  # pylint: disable=too-many-ancestors,duplicate-code
 
         parallel_default = True
         if platform.machine() == "arm64":
-            warnings.warn(
-                "Disabling Numba threading due to ARM64 CPU (atomics do not work yet)"
-            )
+            if "CI" not in os.environ:
+                warnings.warn(
+                    "Disabling Numba threading due to ARM64 CPU (atomics do not work yet)"
+                )
             parallel_default = False  # TODO #1183 - atomics don't work on ARM64!
 
         try:

{PySDM-2.78 → PySDM-2.79}/PySDM.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM
-Version: 2.78
+Version: 2.79
 Summary: Pythonic particle-based (super-droplet) warm-rain/aqueous-chemistry cloud microphysics package with box, parcel & 1D/2D prescribed-flow examples in Python, Julia and Matlab
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors

{PySDM-2.78 → PySDM-2.79}/PySDM.egg-info/requires.txt

@@ -6,12 +6,13 @@ Pint
 chempy
 scipy
 pyevtk
+flexparser<0.4
 
 [tests]
 matplotlib
 pytest
 pytest-timeout
-PyPartMC==1.3.3
+PyPartMC==1.3.6
 pyrcel
 jupyter-core<5.0.0
 ipywidgets!=8.0.3

{PySDM-2.78 → PySDM-2.79}/examples/PySDM_examples/Arabas_et_al_2015/paraview_hello_world.ipynb

@@ -14,7 +14,6 @@
     "from PySDM import products as PySDM_products\n",
     "import subprocess\n",
     "import glob\n",
-    "import os\n",
     "import platform"
    ]
   },
@@ -145,7 +144,7 @@
     "colorbar_attr.TitleFontSize = 30\n",
     "colorbar_attr.LabelFontSize = 30\n",
     "colorbar_attr.Visibility = True\n",
-    "colorbar_attr.WindowLocation = 'AnyLocation'\n",
+    "colorbar_attr.WindowLocation = 'Any Location'\n",
     "colorbar_attr.Position = [.1, .333]\n",
     "colorbar_attr.RangeLabelFormat = '%g'\n",
     "\n",
@@ -178,7 +177,7 @@
     "colorbar_prod.LabelFontSize = 30\n",
     "colorbar_prod.Visibility = True\n",
     "colorbar_prod.Position = [.92, .333]\n",
-    "colorbar_prod.WindowLocation = 'AnyLocation'\n",
+    "colorbar_prod.WindowLocation = 'Any Location'\n",
     "colorbar_prod.RangeLabelFormat = '%g'\n",
     "\n",
     "# compose the scene\n",
@@ -196,17 +195,16 @@
     "pvs.SaveAnimation('output/anim.ogv', view, FrameRate=10)\n",
     "\n",
     "# save animation frame as pdfs\n",
-    "exporters = pvs.servermanager.createModule('exporters')\n",
-    "exporter = exporters.GL2PSRenderViewExporterPDF()\n",
-    "exporter.Rasterize3Dgeometry = False\n",
-    "exporter.GL2PSdepthsortmethod = 'BSP sorting (slow, best)'\n",
     "for t in reader_prod.TimestepValues:\n",
     "    view.ViewTime = t\n",
     "    for reader in (reader_prod, reader_attr):\n",
-    "        reader.UpdatePipeline(t)\n",
-    "    exporter.SetView(view)\n",
-    "    exporter.FileName = f'output/anim_frame_{t}.pdf'\n",
-    "    exporter.Write()"
+    "        reader.UpdatePipeline(t)    \n",
+    "    pvs.ExportView(\n",
+    "        filename=f'output/anim_frame_{t}.pdf',\n",
+    "        view=view,\n",
+    "        Rasterize3Dgeometry= False,\n",
+    "        GL2PSdepthsortmethod= 'BSP sorting (slow, best)',\n",
+    "    )"
    ]
   },
   {
@@ -223,10 +221,7 @@
    "id": "79477d3d",
    "metadata": {},
    "outputs": [],
-   "source": [
-    "if not ('CI' in os.environ and platform.system() == 'Windows'):\n",
-    "    subprocess.check_output(['pvpython', 'pvscript.py'], shell=True)"
-   ]
+   "source": "subprocess.run(['pvpython', '--force-offscreen-rendering', 'pvscript.py'], check=platform.system() != 'Windows')"
   },
   {
    "cell_type": "markdown",
@@ -243,9 +238,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "for file in glob.glob('output/anim_frame_*.pdf'):\n",
-    "    subprocess.run(['ps2pdf', file, file+'_'], capture_output=True, check=True)\n",
-    "    subprocess.call(['mv', file+'_', file])"
+    "if platform.system() != 'Windows':\n",
+    "    for file in glob.glob('output/anim_frame_*.pdf'):\n",
+    "        subprocess.run(['ps2pdf', file, file+'_'], capture_output=True, check=True)\n",
+    "        subprocess.run(['mv', file+'_', file], check=True)"
    ]
   },
   {

{PySDM-2.78 → PySDM-2.79}/setup.py

@@ -37,6 +37,7 @@ setup(
                 10: "==0.60.0",
                 11: "==0.60.0",
                 12: "==0.60.0",
+                13: "==0.60.0",
             }[sys.version_info.minor]
             if CI and not _32bit
             else ">=0.51.2"
@@ -50,6 +51,7 @@ setup(
                 10: "==1.24.4",
                 11: "==1.24.4",
                 12: "==1.26.4",
+                13: "==1.26.4",
             }[sys.version_info.minor]
             if CI
             else ""
@@ -64,18 +66,20 @@ setup(
                 10: "==1.10.1",
                 11: "==1.10.1",
                 12: "==1.13.0",
+                13: "==1.13.0",
             }[sys.version_info.minor]
             if CI and not _32bit
             else ""
         ),
         "pyevtk" + ("==1.2.0" if CI else ""),
+        "flexparser<0.4",
     ],
     extras_require={
         "tests": [
             "matplotlib",
             "pytest",
             "pytest-timeout",
-            "PyPartMC==1.3.3",
+            "PyPartMC==1.3.6",
         ]
         + (
             [