PySDM 3.0.0rc6__tar.gz → 3.0.0rc7__tar.gz

pysdm-3.0.0rc7/.github/actions/env-setup/action.yml

@@ -0,0 +1,61 @@
+name: "Setup environment"
+description: "Checkout repo, setup Python and dependencies"
+inputs:
+  python-version:
+    required: true
+  setup-name:
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/checkout@v4.1.6
+
+    - uses: actions/setup-python@v5.0.0
+      with:
+        python-version: ${{ inputs.python-version }}
+
+    - uses: ./.github/actions/set-pip-path-and-cache-key
+    - uses: actions/cache@v4
+      id: cache
+      with:
+        path: ${{ env.pip_user_site }}
+        key: ${{ inputs.setup-name }}-${{ env.toml_ci_md5 }}
+        lookup-only: true
+
+    - name: pip-install (-e) PySDM and PySDM-examples
+      if:  steps.cache.outputs.cache-hit != 'true' && (! startsWith( inputs.setup-name, 'unit-tests'))
+      run: |
+        python -m pip install -e .[nonunit-tests,CI_version_pins] -e ./examples[CI_version_pins]
+        python -m pip install -r tests/devops_tests/requirements.txt
+        python -c "import PySDM_examples"
+      shell: bash
+
+    - name: pip-install (-e) PySDM
+      if:  steps.cache.outputs.cache-hit != 'true' && startsWith( inputs.setup-name, 'unit-tests')
+      run: |
+        python -m pip install -e .[unit-tests,CI_version_pins]
+        python -m pip install -r tests/devops_tests/requirements.txt
+        python <<EOF
+        try:
+            import PySDM_examples
+            exit(1)
+        except ImportError:
+            exit(0)
+        EOF
+      shell: bash
+
+    - uses: actions/cache/save@v4
+      if: steps.cache.outputs.cache-hit != 'true'
+      with:
+        path: ${{ env.pip_user_site }}
+        key: ${{ inputs.setup-name }}-${{ env.toml_ci_md5 }}
+
+    - if: steps.cache.outputs.cache-hit == 'true'
+      run: rm -rf $pip_user_site
+      shell: bash
+    - if: steps.cache.outputs.cache-hit == 'true'
+      uses: actions/cache/restore@v4
+      with:
+        fail-on-cache-miss: true
+        path: ${{ env.pip_user_site }}
+        key: ${{ inputs.setup-name }}-${{ env.toml_ci_md5 }}

pysdm-3.0.0rc7/.github/actions/set-pip-path-and-cache-key/action.yml

@@ -0,0 +1,18 @@
+name: "Set pip path and cache key"
+runs:
+  using: "composite"
+  steps:
+    - run: |
+        echo "pip_user_site=$(python -c "import sysconfig; print(sysconfig.get_path('purelib'))")" >> $GITHUB_ENV
+        hash_input_files="
+          pyproject.toml
+          setup.py
+          examples/pyproject.toml
+          examples/setup.py
+          tests/devops_tests/requirements.txt
+          .github/workflows/tests.yml
+          .github/actions/env-setup/action.yml
+        "
+        files=($hash_input_files)
+        cat "${files[@]}" | python -c 'import sys, hashlib; print("toml_ci_md5=" + hashlib.md5(sys.stdin.buffer.read()).hexdigest())' >> $GITHUB_ENV
+      shell: bash

{pysdm-3.0.0rc6 → pysdm-3.0.0rc7}/.github/workflows/tests.yml

@@ -10,7 +10,7 @@ env:
   anim_test-suite: 'multi-process_a'
   # common options for pytest
   pytest_options: "--durations=10 -v -s -We -p no:unraisableexception"
-        
+
 on:
   push:
     branches: [ main ]
@@ -22,25 +22,60 @@ on:
     - cron: '0 13 * * 4'
 
 jobs:
+  env-unit-tests-setup:
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04, macos-13, macos-14, windows-latest ]
+        python-version: [ "3.9", "3.12" ]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v4.1.6
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - uses: ./.github/actions/env-setup
+        with:
+          python-version: ${{ matrix.python-version }}
+          setup-name: unit-tests-${{ matrix.platform }}-${{ matrix.python-version }}
+
+  env-nonunit-tests-setup:
+    strategy:
+      matrix:
+        platform: [ubuntu-24.04, macos-14, windows-latest]
+        python-version: ["3.12"]
+        include: # for pylint
+          - platform: ubuntu-24.04
+            python-version: "3.9"
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v4.1.6
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - uses: ./.github/actions/env-setup
+        with:
+          python-version: ${{ matrix.python-version }}
+          setup-name: nonunit-tests-${{ matrix.platform }}-${{ matrix.python-version }}
+
   pylint:
-    runs-on: ubuntu-24.04
+    needs: env-nonunit-tests-setup
+    strategy:
+      matrix:
+        platform: [ubuntu-24.04]
+        python-version: ["3.9"]
+    runs-on: ${{ matrix.platform }}
     steps:
     - uses: actions/checkout@v4.1.6
       with:
         submodules: recursive
         fetch-depth: 0
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v5.0.0
+    - uses: ./.github/actions/env-setup
       with:
-        python-version: 3.9
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
+        python-version: ${{ matrix.python-version }}
+        setup-name: nonunit-tests-${{ matrix.platform }}-${{ matrix.python-version }}
+    - run: |
         # TODO #1160 https://github.com/pylint-dev/pylint/issues/9099
         pip install "pylint<3.0.0" nbqa
-        pip install -r tests/devops_tests/requirements.txt
-        pip install -e ./examples[tests]
-        pip install -e .[tests]
     - run: |
         # TODO #682
         pylint --unsafe-load-any-extension=y --disable=fixme,invalid-name,missing-function-docstring,missing-class-docstring,protected-access,duplicate-code $(git ls-files '*.py' | grep -v -e ^examples -e ^tutorials)
@@ -51,9 +86,8 @@ jobs:
         # TODO #682
         nbqa pylint --unsafe-load-any-extension=y --disable=fixme,duplicate-code,invalid-name,trailing-whitespace,line-too-long,missing-function-docstring,wrong-import-position,missing-module-docstring,wrong-import-order,ungrouped-imports,no-member,too-many-locals,unnecessary-lambda-assignment $(git ls-files '*.ipynb')
 
-  
-
-  nojit_and_codecov:
+  unit-tests-without-jit-plus-codecov:
+    needs: env-unit-tests-setup
     strategy:
       matrix:
         platform: [ ubuntu-24.04, macos-13, macos-14, windows-latest ]
@@ -67,15 +101,15 @@ jobs:
       with:
         submodules: recursive
         fetch-depth: 0
-    - uses: actions/setup-python@v5.0.0
+    - uses: ./.github/actions/env-setup
       with:
         python-version: ${{ matrix.python-version }}
+        setup-name: unit-tests-${{ matrix.platform }}-${{ matrix.python-version }}
+
     - name: Generate coverage report
       run: |
-        pip install -e .[tests]
-        pip install -e ./examples
-        pip install pytest-cov
-        pytest ${{ env.pytest_options }} tests/unit_tests --cov-report=xml --cov=PySDM
+        python -m pip install pytest-cov
+        python -m pytest ${{ env.pytest_options }} tests/unit_tests --cov-report=xml --cov=PySDM
     - uses: codecov/codecov-action@v4.5.0
       with:
         fail_ci_if_error: true
@@ -83,23 +117,14 @@ jobs:
         token: ${{ secrets.CODECOV_TOKEN }}
         env_vars: PYTHON,RUNNER_OS
 
-  tests:
-    needs: [pylint,nojit_and_codecov]
+  unit-tests-with-jit:
+    needs: [ pylint, unit-tests-without-jit-plus-codecov ]
     strategy:
       matrix:
-        platform: [ubuntu-24.04, macos-14, windows-latest]
-        python-version: ["3.12"]
-        test-suite: ["unit_tests/!(dynamics)", "unit_tests/dynamics/!(condensation|collisions)", "unit_tests/dynamics/condensation", "unit_tests/dynamics/collisions","smoke_tests/no_env", "smoke_tests/box", "smoke_tests/parcel_a", "smoke_tests/parcel_b", "smoke_tests/parcel_c", "smoke_tests/parcel_d", "smoke_tests/kinematic_1d", "smoke_tests/kinematic_2d", "tutorials_tests"]
+        platform: [ ubuntu-24.04, macos-14, windows-latest ]
+        python-version: [ "3.12" ]
+        test-suite: [ "unit_tests/!(dynamics)", "unit_tests/dynamics/!(condensation|collisions)", "unit_tests/dynamics/condensation", "unit_tests/dynamics/collisions" ]
         exclude:
-          # 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/parcel_d"
-          - platform: "macos-14"
-            test-suite: "smoke_tests/kinematic_2d"
           - platform: "macos-14"
             test-suite: "unit_tests/!(dynamics)"
       fail-fast: true
@@ -110,77 +135,67 @@ jobs:
         with:
           submodules: recursive
           fetch-depth: 0
-      - uses: actions/setup-python@v5.0.0
+      - uses: ./.github/actions/env-setup
         with:
           python-version: ${{ matrix.python-version }}
+          setup-name: unit-tests-${{ matrix.platform }}-${{ matrix.python-version }}
 
-      - run: pip install -e .
-
-      # sanity check if we do not depend on something from tests extras
-      - run: python -We -c "import PySDM"
-
-      - if: startsWith(matrix.test-suite, 'smoke_tests') || matrix.test-suite == 'tutorials_tests'
-        run: pip install -e ./examples
-
-      # 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
-
-      # https://github.com/numba/numba/issues/6350#issuecomment-728174860
       - if: startsWith(matrix.platform, 'ubuntu-')
         run: echo NUMBA_THREADING_LAYER=omp >> $GITHUB_ENV
-
       - name: Run pytest
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NUMBA_OPT: 1
         run: |
           shopt -s extglob
-          pytest ${{ env.pytest_options }} --timeout=900 --timeout_method=thread tests/${{ matrix.test-suite }}
+          python -m pip install pytest-timeout
+          python -m pytest ${{ env.pytest_options }} --timeout=900 --timeout_method=thread tests/${{ matrix.test-suite }}
 
-  examples-setup:
-    needs: [pylint,nojit_and_codecov]
+  smoke-tests-with-jit:
+    needs: [ pylint, env-nonunit-tests-setup ]
     strategy:
       matrix:
-        platform: [ubuntu-24.04, macos-14, windows-latest]
-        python-version: ["3.12"]
+        platform: [ ubuntu-24.04, macos-14, windows-latest ]
+        python-version: [ "3.12" ]
+        test-suite: [ "smoke_tests/no_env", "smoke_tests/box", "smoke_tests/parcel_a", "smoke_tests/parcel_b", "smoke_tests/parcel_c", "smoke_tests/parcel_d", "smoke_tests/kinematic_1d", "smoke_tests/kinematic_2d", "tutorials_tests" ]
+        exclude:
+          # 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/parcel_d"
+          - platform: "macos-14"
+            test-suite: "smoke_tests/kinematic_2d"
+      fail-fast: true
     runs-on: ${{ matrix.platform }}
+    timeout-minutes: ${{ startsWith(matrix.platform, 'ubuntu-') && 25 || 40 }}
     steps:
       - uses: actions/checkout@v4.1.6
         with:
           submodules: recursive
           fetch-depth: 0
-      - uses: actions/setup-python@v5.0.0
+      - uses: ./.github/actions/env-setup
         with:
           python-version: ${{ matrix.python-version }}
-      - run: |
-          echo pip_user_site=$(python -c "import sysconfig; print(sysconfig.get_path('purelib'))") >> $GITHUB_ENV
-          echo toml_ci_md5=$(cat pyproject.toml setup.py examples/pyproject.toml examples/setup.py tests/devops_tests/requirements.txt .github/workflows/tests.yml \
-          | python -c "import hashlib;print(hashlib.md5(open(0,'rb').read()).hexdigest())") >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        id: cache
-        with:
-          path: ${{ env.pip_user_site }}
-          key: examples_pip_cache-${{ matrix.platform }}-${{ matrix.python-version }}-${{ env.toml_ci_md5 }}
-          lookup-only: true
-      - if: steps.cache.outputs.cache-hit != 'true'
+          setup-name: nonunit-tests-${{ matrix.platform }}-${{ matrix.python-version }}
+
+      - if: startsWith(matrix.platform, 'ubuntu-')
+        run: echo NUMBA_THREADING_LAYER=omp >> $GITHUB_ENV
+      - name: Run pytest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NUMBA_OPT: 1
         run: |
-          python -m pip uninstall -y jupyterlab-server # https://github.com/pypa/pip/issues/6275
-          python -m pip install -e . -e ./examples
+          shopt -s extglob
           python -m pip install pytest-timeout
-          python -m pip install -r tests/devops_tests/requirements.txt
-      - if: steps.cache.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ env.pip_user_site }}
-          key: examples_pip_cache-${{ matrix.platform }}-${{ matrix.python-version }}-${{ env.toml_ci_md5 }}
+          python -m pytest ${{ env.pytest_options }} --timeout=900 --timeout_method=thread tests/${{ matrix.test-suite }}
+
 
   examples:
-    needs: [examples-setup]
+    needs: [pylint, env-nonunit-tests-setup]
     strategy:
       matrix:
         platform: [ubuntu-24.04, macos-14, windows-latest]
@@ -190,27 +205,22 @@ jobs:
     runs-on: ${{ matrix.platform }}
     timeout-minutes: ${{ startsWith(matrix.platform, 'windows-') && 28 || 17 }}
     steps:
+      - name: Debug contexts
+        run: |
+          echo "MATRIX:"
+          printf '%s\n' "${{ toJson(matrix) }}"
+          echo "ENV:"
+          printf '%s\n' "${{ toJson(env) }}"
+          echo "anim_test-suite=${{ env.anim_test_suite }}, anim_python-version=${{ env.anim_python_version }}"
       - uses: actions/checkout@v4.1.6
         with:
           submodules: recursive
           fetch-depth: 0
-      - uses: actions/setup-python@v5.0.0
+      - uses: ./.github/actions/env-setup
         with:
           python-version: ${{ matrix.python-version }}
-      - run: |
-          echo pip_user_site=$(python -c "import sysconfig; print(sysconfig.get_path('purelib'))") >> $GITHUB_ENV
-          echo toml_ci_md5=$(cat pyproject.toml setup.py examples/pyproject.toml examples/setup.py tests/devops_tests/requirements.txt .github/workflows/tests.yml \
-          | python -c "import hashlib;print(hashlib.md5(open(0,'rb').read()).hexdigest())") >> $GITHUB_ENV
-      - run: |
-          rm -rf $pip_user_site
-      - id: cache
-        uses: actions/cache/restore@v4
-        with:
-          fail-on-cache-miss: true
-          path: ${{ env.pip_user_site }}
-          key: examples_pip_cache-${{ matrix.platform }}-${{ matrix.python-version }}-${{ env.toml_ci_md5 }}
-
-      # https://github.com/numba/numba/issues/6350#issuecomment-728174860
+          setup-name: nonunit-tests-${{ matrix.platform }}-${{ matrix.python-version }}
+          # https://github.com/numba/numba/issues/6350#issuecomment-728174860
       - if: startsWith(matrix.platform, 'ubuntu-')
         run: echo NUMBA_THREADING_LAYER=omp >> $GITHUB_ENV
 
@@ -221,7 +231,7 @@ jobs:
           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' || matrix.test-suite == 'multi-process_b')
         run: |
           brew update
@@ -235,7 +245,7 @@ jobs:
           msiexec //i paraview.msi //quiet //qn //norestart 
           echo "C:\\Program Files\\ParaView 5.13.1\\bin\\" >> $GITHUB_PATH
 
-      - if: matrix.test-suite == (matrix.test-suite == 'multi-process_a' || matrix.test-suite == 'multi-process_b')
+      - if: matrix.test-suite == 'multi-process_a' || matrix.test-suite == 'multi-process_b'
         run: |
           pvpython --version
           pvpython -c "from paraview import simple"
@@ -244,8 +254,9 @@ jobs:
           python -m pytest ${{ env.pytest_options }} tests/examples_tests/test_tests_completeness.py
 
       - run: |
+          python -m pip install pytest-timeout
           python -m pytest ${{ env.pytest_options }} --basetemp=/tmp/pytest --timeout_method=thread --timeout=${{ startsWith(matrix.platform, 'windows-') && 1000 || 900 }} tests/examples_tests/test_run* --suite ${{ matrix.test-suite }}
-        
+
       - if: ( ! startsWith(matrix.platform, 'windows-') ) && matrix.test-suite == env.anim_test-suite && matrix.python-version == env.anim_python-version
         run: |
           set -x

{pysdm-3.0.0rc6 → pysdm-3.0.0rc7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm
-Version: 3.0.0rc6
+Version: 3.0.0rc7
 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
 Author-email: "https://github.com/open-atmos/PySDM/graphs/contributors" <sylwester.arabas@agh.edu.pl>
 License-Expression: GPL-3.0-only
@@ -20,7 +20,7 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ThrustRTC==0.3.20
+Requires-Dist: ThrustRTC>=0.3.20
 Requires-Dist: CURandRTC>=0.1.2
 Requires-Dist: numba>=0.51.2
 Requires-Dist: numpy
@@ -28,17 +28,22 @@ Requires-Dist: Pint
 Requires-Dist: chempy
 Requires-Dist: scipy
 Requires-Dist: pyevtk
-Provides-Extra: tests
-Requires-Dist: matplotlib; extra == "tests"
-Requires-Dist: Pillow; extra == "tests"
-Requires-Dist: pytest; extra == "tests"
-Requires-Dist: pytest-timeout; extra == "tests"
-Requires-Dist: PySDM-examples; extra == "tests"
-Requires-Dist: open-atmos-jupyter-utils>=v1.2.0; extra == "tests"
-Requires-Dist: PyPartMC; extra == "tests"
-Requires-Dist: pyrcel; extra == "tests"
-Requires-Dist: jupyter-core<5.0.0; extra == "tests"
-Requires-Dist: ipywidgets!=8.0.3; extra == "tests"
+Provides-Extra: unit-tests
+Requires-Dist: pytest; extra == "unit-tests"
+Requires-Dist: pytest-timeout; extra == "unit-tests"
+Requires-Dist: matplotlib!=3.9.1; extra == "unit-tests"
+Requires-Dist: Pillow<11.3.0; extra == "unit-tests"
+Provides-Extra: nonunit-tests
+Requires-Dist: pytest; extra == "nonunit-tests"
+Requires-Dist: PySDM-examples; extra == "nonunit-tests"
+Requires-Dist: PyPartMC; extra == "nonunit-tests"
+Provides-Extra: ci-version-pins
+Requires-Dist: PyPartMC==1.7.2; extra == "ci-version-pins"
+Requires-Dist: numba==0.60.0; extra == "ci-version-pins"
+Requires-Dist: CURandRTC==0.1.7; extra == "ci-version-pins"
+Requires-Dist: Pint==0.21.1; extra == "ci-version-pins"
+Requires-Dist: chempy==0.8.3; extra == "ci-version-pins"
+Requires-Dist: pyevtk==1.6.0; extra == "ci-version-pins"
 Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
@@ -170,7 +175,7 @@ the license of the contributed code must be compatible with GPL v3.
 Developing the code, we follow [The Way of Python](https://www.python.org/dev/peps/pep-0020/) and 
 the [KISS principle](https://en.wikipedia.org/wiki/KISS_principle).
 The codebase has greatly benefited from [PyCharm code inspections](https://www.jetbrains.com/help/pycharm/code-inspection.html)
-and [Pylint](https://pylint.org), [Black](https://black.readthedocs.io/en/stable/) and [isort](https://pycqa.github.io/isort/)
+and [Pylint](https://pylint.readthedocs.io/en/stable/), [Black](https://black.readthedocs.io/en/stable/) and [isort](https://pycqa.github.io/isort/)
 code analysis (which are all part of the CI workflows).
 
 We also use [pre-commit hooks](https://pre-commit.com). 

{pysdm-3.0.0rc6 → pysdm-3.0.0rc7}/README.md

@@ -125,7 +125,7 @@ the license of the contributed code must be compatible with GPL v3.
 Developing the code, we follow [The Way of Python](https://www.python.org/dev/peps/pep-0020/) and 
 the [KISS principle](https://en.wikipedia.org/wiki/KISS_principle).
 The codebase has greatly benefited from [PyCharm code inspections](https://www.jetbrains.com/help/pycharm/code-inspection.html)
-and [Pylint](https://pylint.org), [Black](https://black.readthedocs.io/en/stable/) and [isort](https://pycqa.github.io/isort/)
+and [Pylint](https://pylint.readthedocs.io/en/stable/), [Black](https://black.readthedocs.io/en/stable/) and [isort](https://pycqa.github.io/isort/)
 code analysis (which are all part of the CI workflows).
 
 We also use [pre-commit hooks](https://pre-commit.com). 

{pysdm-3.0.0rc6 → pysdm-3.0.0rc7}/examples/setup.py

@@ -1,7 +1,5 @@
 import os
-import platform
 import re
-import sys
 
 from setuptools import find_packages, setup
 
@@ -26,42 +24,34 @@ setup(
     "and depicting how to use PySDM from Python Jupyter notebooks",
     install_requires=[
         "PySDM",
-        "PyMPDATA" + (">=1.0.15" if CI else ""),
+        "PyMPDATA",
         "open-atmos-jupyter-utils",
         "pystrict",
-        # https://github.com/matplotlib/matplotlib/issues/28551
-        "matplotlib" + ("!=3.9.1" if CI else ""),
-        "Pillow"
-        + (
-            "<11.3.0" if CI else ""
-        ),  # matplotlib triggers deprecation warnings in 11.3.0
+        "matplotlib",
+        "Pillow",
         "joblib",
         "ipywidgets",
         "seaborn",
         "numdifftools",
         "vtk",
-    ]
-    + (
-        ["pyvinecopulib" + ("==0.7.3" if CI else ">=0.7.3")]
-        if not (sys.platform == "darwin" and platform.machine() == "x86_64")
-        else []
-    ),
+        "pyrcel",
+        "pyvinecopulib",
+    ],
     extras_require={
-        "tests": [
-            "pytest",
-            "nbconvert",
-            "jupyter-core" + "<5.0.0" if CI else "",
-            # https://github.com/jupyter/nbformat/issues/232
-            "jsonschema" + "==3.2.0" if CI else "",
-            # https://github.com/jupyter/nbconvert/issues/1568
-            "Jinja2" + "<3.0.0" if CI else "",
-            # https://github.com/aws/aws-sam-cli/issues/3661
-            "MarkupSafe" + "<2.1.0" if CI else "",
-            # github.com/python-pillow/Pillow/blob/main/docs/releasenotes/9.1.0.rst#deprecations
-            "Pillow" + "<9.1.0" if CI else "",
-            "ipywidgets" + "<8.0.3" if CI else "",
-            # https://github.com/dask/distributed/issues/7688
-            "ipykernel" + "<6.22.0" if CI else "",
+        "CI_version_pins": [
+            "PySDM[CI_version_pins]",
+            "PyMPDATA==1.6.1",
+            "open-atmos-jupyter-utils==1.3.0",
+            "pystrict==1.3",
+            "matplotlib!=3.9.1",
+            "Pillow<11.3.0",
+            "joblib==1.5.1",
+            "ipywidgets==8.1.7",
+            "seaborn==0.13.2",
+            "numdifftools==0.9.41",
+            "vtk==9.5.0",
+            "pyrcel==1.3.2",
+            "pyvinecopulib==0.7.3",
         ]
     },
     author="https://github.com/open-atmos/PySDM/graphs/contributors",

{pysdm-3.0.0rc6 → pysdm-3.0.0rc7}/pysdm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm
-Version: 3.0.0rc6
+Version: 3.0.0rc7
 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
 Author-email: "https://github.com/open-atmos/PySDM/graphs/contributors" <sylwester.arabas@agh.edu.pl>
 License-Expression: GPL-3.0-only
@@ -20,7 +20,7 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ThrustRTC==0.3.20
+Requires-Dist: ThrustRTC>=0.3.20
 Requires-Dist: CURandRTC>=0.1.2
 Requires-Dist: numba>=0.51.2
 Requires-Dist: numpy
@@ -28,17 +28,22 @@ Requires-Dist: Pint
 Requires-Dist: chempy
 Requires-Dist: scipy
 Requires-Dist: pyevtk
-Provides-Extra: tests
-Requires-Dist: matplotlib; extra == "tests"
-Requires-Dist: Pillow; extra == "tests"
-Requires-Dist: pytest; extra == "tests"
-Requires-Dist: pytest-timeout; extra == "tests"
-Requires-Dist: PySDM-examples; extra == "tests"
-Requires-Dist: open-atmos-jupyter-utils>=v1.2.0; extra == "tests"
-Requires-Dist: PyPartMC; extra == "tests"
-Requires-Dist: pyrcel; extra == "tests"
-Requires-Dist: jupyter-core<5.0.0; extra == "tests"
-Requires-Dist: ipywidgets!=8.0.3; extra == "tests"
+Provides-Extra: unit-tests
+Requires-Dist: pytest; extra == "unit-tests"
+Requires-Dist: pytest-timeout; extra == "unit-tests"
+Requires-Dist: matplotlib!=3.9.1; extra == "unit-tests"
+Requires-Dist: Pillow<11.3.0; extra == "unit-tests"
+Provides-Extra: nonunit-tests
+Requires-Dist: pytest; extra == "nonunit-tests"
+Requires-Dist: PySDM-examples; extra == "nonunit-tests"
+Requires-Dist: PyPartMC; extra == "nonunit-tests"
+Provides-Extra: ci-version-pins
+Requires-Dist: PyPartMC==1.7.2; extra == "ci-version-pins"
+Requires-Dist: numba==0.60.0; extra == "ci-version-pins"
+Requires-Dist: CURandRTC==0.1.7; extra == "ci-version-pins"
+Requires-Dist: Pint==0.21.1; extra == "ci-version-pins"
+Requires-Dist: chempy==0.8.3; extra == "ci-version-pins"
+Requires-Dist: pyevtk==1.6.0; extra == "ci-version-pins"
 Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
@@ -170,7 +175,7 @@ the license of the contributed code must be compatible with GPL v3.
 Developing the code, we follow [The Way of Python](https://www.python.org/dev/peps/pep-0020/) and 
 the [KISS principle](https://en.wikipedia.org/wiki/KISS_principle).
 The codebase has greatly benefited from [PyCharm code inspections](https://www.jetbrains.com/help/pycharm/code-inspection.html)
-and [Pylint](https://pylint.org), [Black](https://black.readthedocs.io/en/stable/) and [isort](https://pycqa.github.io/isort/)
+and [Pylint](https://pylint.readthedocs.io/en/stable/), [Black](https://black.readthedocs.io/en/stable/) and [isort](https://pycqa.github.io/isort/)
 code analysis (which are all part of the CI workflows).
 
 We also use [pre-commit hooks](https://pre-commit.com). 

{pysdm-3.0.0rc6 → pysdm-3.0.0rc7}/pysdm.egg-info/SOURCES.txt

@@ -11,6 +11,8 @@ setup.py
 .binder/postBuild
 .binder/requirements.txt
 .github/dependabot.yml
+.github/actions/env-setup/action.yml
+.github/actions/set-pip-path-and-cache-key/action.yml
 .github/workflows/cancel.yml
 .github/workflows/pdoc.yml
 .github/workflows/precommit.yml

pysdm-3.0.0rc7/pysdm.egg-info/requires.txt

@@ -0,0 +1,27 @@
+ThrustRTC>=0.3.20
+CURandRTC>=0.1.2
+numba>=0.51.2
+numpy
+Pint
+chempy
+scipy
+pyevtk
+
+[CI_version_pins]
+PyPartMC==1.7.2
+numba==0.60.0
+CURandRTC==0.1.7
+Pint==0.21.1
+chempy==0.8.3
+pyevtk==1.6.0
+
+[nonunit-tests]
+pytest
+PySDM-examples
+PyPartMC
+
+[unit-tests]
+pytest
+pytest-timeout
+matplotlib!=3.9.1
+Pillow<11.3.0