Maintenance; bump versions

emsig · Feb 16, 2024 · c5fb8d7 · c5fb8d7
1 parent ade673d
commit c5fb8d7
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 45 deletions.
diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml
@@ -20,9 +20,9 @@ jobs:
 
     steps:
 
-      # Cancel any previous run of the test job; [pin v0.10.0 (2022-06-27)]
+      # Cancel any previous run of the test job; [pin v0.12.1 (2024-01-25)]
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@bb6001c4ea612bf59c3abfc4756fbceee4f870c7
+        uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa
         with:
           access_token: ${{ github.token }}
 
@@ -33,7 +33,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Install dependencies
         shell: bash -l {0}

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -31,31 +31,31 @@ jobs:
       matrix:
         os: [ubuntu, ]  # macos, windows]  # Only Linux currently.
         case:
-          - python-version: "3.8"
+          - python-version: "3.9"
             name: minimal
             os: ubuntu
-            conda: "'scipy=1.5' 'numpy=1.19' 'numba=0.50'"
-          - python-version: "3.9"
+            conda: "'scipy=1.8' 'numba=0.53'"
+          - python-version: "3.10"
             name: full
             os: ubuntu
             conda: "numba scipy xarray empymod h5py scooby discretize matplotlib"  # tqdm
-          - python-version: "3.9"
+          - python-version: "3.10"
             name: plain
             os: ubuntu
             conda: "numba scipy"
-          - python-version: "3.10"
+          - python-version: "3.11"
             name: plain
             os: ubuntu
             conda: "numba scipy"
-          - python-version: "3.10"
+          - python-version: "3.11"
             name: full
             os: ubuntu
             conda: "numba scipy xarray tqdm empymod h5py scooby discretize matplotlib"
-          - python-version: "3.11"
+          - python-version: "3.12"
             name: plain
             os: ubuntu
             conda: "numba scipy"
-          - python-version: "3.11"
+          - python-version: "3.12"
             name: full
             os: ubuntu
             conda: "numba scipy xarray tqdm empymod h5py scooby discretize matplotlib"
@@ -67,9 +67,9 @@ jobs:
 
     steps:
 
-      # Cancel any previous run of the test job; [pin v0.10.0 (2022-06-27)]
+      # Cancel any previous run of the test job; [pin v0.12.1 (2024-01-25)]
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@bb6001c4ea612bf59c3abfc4756fbceee4f870c7
+        uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa
         with:
           access_token: ${{ github.token }}
 
@@ -91,8 +91,8 @@ jobs:
         run: git fetch origin 'refs/tags/*:refs/tags/*'
 
       - name: Setup miniconda
-        # [pin v2.1.1 (2021-04-01)]
-        uses: conda-incubator/setup-miniconda@35d1405e78aa3f784fe3ce9a2eb378d5eeb62169
+        # [pin v3.0.1 (2023-11-29)]
+        uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a
         with:
           auto-update-conda: true
           python-version: ${{ matrix.case.python-version }}
@@ -120,7 +120,7 @@ jobs:
       - name: Test with pytest
         shell: bash -l {0}
         run: |
-          pip install --no-build-isolation --no-deps .
+          python -m pip install .
           pytest --cov=emg3d
 
       - name: Coveralls
@@ -174,7 +174,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install wheel setuptools-scm
+          python -m pip install build setuptools-scm
 
       - name: Build source and wheel distributions
         if: github.ref == 'refs/heads/main'
@@ -187,8 +187,7 @@ jobs:
       - name: Build source and wheel distributions
         run: |
           # Build source and wheel packages
-          python setup.py sdist
-          python setup.py bdist_wheel
+          python -m build
           echo ""
           echo "Generated files:"
           ls -lh dist/

diff --git a/.github/workflows/macos_windows.yml b/.github/workflows/macos_windows.yml
@@ -30,13 +30,13 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos, windows]
-        python: [3.9, ]
+        python: [3.11, ]
 
     steps:
 
-      # Cancel any previous run of the test job; [pin v0.10.0 (2022-06-27)]
+      # Cancel any previous run of the test job; [pin v0.12.1 (2024-01-25)]
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@bb6001c4ea612bf59c3abfc4756fbceee4f870c7
+        uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa
         with:
           access_token: ${{ github.token }}
 
@@ -58,8 +58,8 @@ jobs:
         run: git fetch origin 'refs/tags/*:refs/tags/*'
 
       - name: Setup miniconda
-        # [pin v2.1.1 (2021-04-01)]
-        uses: conda-incubator/setup-miniconda@35d1405e78aa3f784fe3ce9a2eb378d5eeb62169
+        # [pin v3.0.1 (2023-11-29)]
+        uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a
         with:
           auto-update-conda: true
           python-version: ${{ matrix.python }}
@@ -83,5 +83,5 @@ jobs:
       - name: Test with pytest
         shell: bash -l {0}
         run: |
-          pip install --no-build-isolation --no-deps .
+          python -m pip install .
           pytest
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,22 @@ Changelog
 """"""""""
 
 
+latest
+------
+
+- Maintenance:
+
+  - Bumped the minimum requirements to:
+
+    - Python 3.9
+    - SciPy 1.8
+    - Numba 0.53
+
+  - Testing: added Python 3.12, dropped Python 3.8.
+
+  - Fix remaining outdated ``python setup.py`` commands.
+
+
 v1.8.2 : convert & pip-full
 ---------------------------
 

diff --git a/Makefile b/Makefile
@@ -13,10 +13,10 @@ help:
 	@echo ""
 
 install:
-	pip install --no-build-isolation --no-deps -e .
+	python -m pip install --no-build-isolation --no-deps -e .
 
 dev-install:
-	pip install -r requirements-dev.txt && pip install --no-build-isolation --no-deps -e .
+	python -m pip install -r requirements-dev.txt && python -m pip install --no-build-isolation --no-deps -e .
 
 pytest:
 	rm -rf .coverage htmlcov/ .pytest_cache/ && pytest --cov=emg3d && coverage html
@@ -37,7 +37,7 @@ linkcheck:
 	cd docs && make linkcheck
 
 clean:
-	pip uninstall emg3d -y
+	python -m pip uninstall emg3d -y
 	rm -rf build/ dist/ .eggs/ emg3d.egg-info/ emg3d/version.py  # build
 	rm -rf */__pycache__/ */*/__pycache__/      # python cache
 	rm -rf .coverage htmlcov/ .pytest_cache/    # tests and coverage

diff --git a/docs/conf.py b/docs/conf.py
@@ -106,5 +106,5 @@
 # the check; they "should" be permanent, that is their entire purpose; doi.org
 # is responsible for resolving them.
 linkcheck_ignore = [
-    "https://doi.org/10.*",
+    "https://doi.org/*",  # DOIs should be permanent (their entire purpose)
 ]
diff --git a/docs/index.rst b/docs/index.rst
@@ -43,7 +43,7 @@ emg3d Documentation
 
     .. grid-item-card::
 
-        :fa:`fas fa-picture-o;fa-4x`
+        :fa:`image;fa-4x`
 
         Gallery
         ^^^^^^^

diff --git a/docs/manual/installation.rst b/docs/manual/installation.rst
@@ -13,9 +13,8 @@ or via ``pip``:
 
    pip install emg3d
 
-Minimum requirements are Python version 3.8 or higher and the modules ``scipy``
-and ``numba``. Various other packages are recommended or required for some
-advanced functionalities, namely:
+Requirements are the modules ``scipy`` and ``numba``. Various other packages
+are recommended or required for some advanced functionalities, namely:
 
 - ``xarray``: For the :class:`emg3d.surveys.Survey` and
   :class:`emg3d.simulations.Simulation` classes (model many sources and

diff --git a/setup.py b/setup.py
@@ -1,13 +1,8 @@
 # -*- coding: utf-8 -*-
 import os
 import re
-import sys
 from setuptools import setup
 
-if not sys.version_info[:2] >= (3, 8):
-    sys.exit(f"emg3d is only meant for Python 3.8 and up.\n"
-             f"Current version: {sys.version_info[0]}.{sys.version_info[1]}.")
-
 # Get README and remove badges.
 with open("README.rst") as f:
     readme = re.sub(r"\|.*\|", "", f.read(), flags=re.DOTALL)
@@ -24,20 +19,17 @@
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "License :: OSI Approved :: Apache Software License",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python",
     ],
     entry_points={
         "console_scripts": [
             "emg3d=emg3d.cli.main:main",
         ],
     },
-    python_requires=">=3.8",
+    python_requires=">=3.9",
     install_requires=[
-        "scipy>=1.5",
-        "numba>=0.50",
+        "scipy>=1.8",
+        "numba>=0.53",
     ],
     extras_require={
         'full': [
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,7 @@ emg3d Documentation @@
         .. grid-item-card::
-            :fa:`fas fa-picture-o;fa-4x`
+            :fa:`image;fa-4x`
             Gallery
             ^^^^^^^
@@ Expand Down @@