Merge pull request #201 from munterfi/feature/update-python

Update to Python 3.11 and new numba version
munterfi · Dec 5, 2023 · 7688f29 · 7688f29
2 parents a025a3e + c9c93c8
commit 7688f29
Show file tree

Hide file tree

Showing 11 changed files with 1,020 additions and 1,026 deletions.
diff --git a/.github/workflows/gdal-stable-test.yml b/.github/workflows/gdal-stable-test.yml
@@ -7,47 +7,47 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.11"]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Install system dependencies
-      run: |
-        sudo add-apt-repository ppa:ubuntugis/ppa && sudo apt-get update
-        sudo apt-get update
-        sudo apt-get install gdal-bin
-        sudo apt-get install libgdal-dev
-
-    - name: Install poetry
-      run: |
-        curl -sSL https://install.python-poetry.org | python3 -
-        echo "${HOME}/.local/bin" >> $GITHUB_PATH
-
-    - name: Set up cache
-      uses: actions/cache@v1
-      with:
-        path: .venv
-        key: venv-${{ matrix.python-version }}-${{ hashFiles('poetry.lock') }}
-
-    - name: Install dependencies
-      run: |
-        poetry config virtualenvs.in-project true
-
-        # Pip install without GDAL
-        poetry export -f requirements.txt --dev --without-hashes | grep -v gdal > requirements.txt
-        python3 -m pip install -r requirements.txt
-
-        # GDAL
-        export CPLUS_INCLUDE_PATH=/usr/include/gdal
-        export C_INCLUDE_PATH=/usr/include/gdal
-        python3 -m pip install --upgrade pip
-        python3 -m pip install --global-option=build_ext --global-option="-I/usr/include/gdal" GDAL==`gdal-config --version`
-
-    - name: Run checks
-      run: |
-        pytest --cov=glacier_flow_model
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install system dependencies
+        run: |
+          sudo add-apt-repository ppa:ubuntugis/ppa && sudo apt-get update
+          sudo apt-get update
+          sudo apt-get install gdal-bin
+          sudo apt-get install libgdal-dev
+
+      - name: Install poetry
+        run: |
+          curl -sSL https://install.python-poetry.org | python3 -
+          echo "${HOME}/.local/bin" >> $GITHUB_PATH
+
+      - name: Set up cache
+        uses: actions/cache@v1
+        with:
+          path: .venv
+          key: venv-${{ matrix.python-version }}-${{ hashFiles('poetry.lock') }}
+
+      - name: Install dependencies
+        run: |
+          poetry config virtualenvs.in-project true
+
+          # Pip install without GDAL
+          poetry export -f requirements.txt --dev --without-hashes | grep -v gdal > requirements.txt
+          python3 -m pip install -r requirements.txt
+
+          # GDAL
+          export CPLUS_INCLUDE_PATH=/usr/include/gdal
+          export C_INCLUDE_PATH=/usr/include/gdal
+          python3 -m pip install --upgrade pip
+          python3 -m pip install --global-option=build_ext --global-option="-I/usr/include/gdal" GDAL==`gdal-config --version`
+
+      - name: Run checks
+        run: |
+          pytest --cov=glacier_flow_model
diff --git a/.github/workflows/gdal-unstable-test.yml b/.github/workflows/gdal-unstable-test.yml
@@ -7,46 +7,46 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.11"]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Install system dependencies
-      run: |
-        sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable && sudo apt-get update
-        sudo apt-get install gdal-bin
-        sudo apt-get install libgdal-dev
-
-    - name: Install poetry
-      run: |
-        curl -sSL https://install.python-poetry.org | python3 -
-        echo "${HOME}/.local/bin" >> $GITHUB_PATH
-
-    - name: Set up cache
-      uses: actions/cache@v1
-      with:
-        path: .venv
-        key: venv-${{ matrix.python-version }}-${{ hashFiles('poetry.lock') }}
-
-    - name: Install dependencies
-      run: |
-        poetry config virtualenvs.in-project true
-
-        # Pip install without GDAL
-        poetry export -f requirements.txt --dev --without-hashes | grep -v gdal > requirements.txt
-        python3 -m pip install -r requirements.txt
-
-        # GDAL
-        export CPLUS_INCLUDE_PATH=/usr/include/gdal
-        export C_INCLUDE_PATH=/usr/include/gdal
-        python3 -m pip install --upgrade pip
-        python3 -m pip install --global-option=build_ext --global-option="-I/usr/include/gdal" GDAL==`gdal-config --version`
-
-    - name: Run checks
-      run: |
-        pytest --cov=glacier_flow_model
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install system dependencies
+        run: |
+          sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable && sudo apt-get update
+          sudo apt-get install gdal-bin
+          sudo apt-get install libgdal-dev
+
+      - name: Install poetry
+        run: |
+          curl -sSL https://install.python-poetry.org | python3 -
+          echo "${HOME}/.local/bin" >> $GITHUB_PATH
+
+      - name: Set up cache
+        uses: actions/cache@v1
+        with:
+          path: .venv
+          key: venv-${{ matrix.python-version }}-${{ hashFiles('poetry.lock') }}
+
+      - name: Install dependencies
+        run: |
+          poetry config virtualenvs.in-project true
+
+          # Pip install without GDAL
+          poetry export -f requirements.txt --dev --without-hashes | grep -v gdal > requirements.txt
+          python3 -m pip install -r requirements.txt
+
+          # GDAL
+          export CPLUS_INCLUDE_PATH=/usr/include/gdal
+          export C_INCLUDE_PATH=/usr/include/gdal
+          python3 -m pip install --upgrade pip
+          python3 -m pip install --global-option=build_ext --global-option="-I/usr/include/gdal" GDAL==`gdal-config --version`
+
+      - name: Run checks
+        run: |
+          pytest --cov=glacier_flow_model
diff --git a/.github/workflows/package-check.yml b/.github/workflows/package-check.yml
@@ -7,42 +7,42 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.11"]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Install system dependencies
-      run: |
-        brew install gdal
-
-    - name: Install poetry
-      run: |
-        curl -sSL https://install.python-poetry.org | python3 -
-        echo "${HOME}/.local/bin" >> $GITHUB_PATH
-
-    - name: Set up cache
-      uses: actions/cache@v1
-      with:
-        path: .venv
-        key: venv-${{ matrix.python-version }}-${{ hashFiles('poetry.lock') }}
-
-    - name: Install dependencies
-      run: |
-        poetry config virtualenvs.in-project true
-        poetry install
-
-    - name: Run checks
-      run: |
-        poetry run flake8 glacier_flow_model tests --count
-        poetry run mypy .
-        poetry run pytest --cov=glacier_flow_model
-        cd docs && poetry run make html && cd ..
-
-    - name: Upload coverage reports to Codecov
-      run: |
-        poetry run codecov
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install system dependencies
+        run: |
+          brew install gdal
+
+      - name: Install poetry
+        run: |
+          curl -sSL https://install.python-poetry.org | python3 -
+          echo "${HOME}/.local/bin" >> $GITHUB_PATH
+
+      - name: Set up cache
+        uses: actions/cache@v1
+        with:
+          path: .venv
+          key: venv-${{ matrix.python-version }}-${{ hashFiles('poetry.lock') }}
+
+      - name: Install dependencies
+        run: |
+          poetry config virtualenvs.in-project true
+          poetry install
+
+      - name: Run checks
+        run: |
+          poetry run flake8 glacier_flow_model tests --count
+          poetry run mypy .
+          poetry run pytest --cov=glacier_flow_model
+          cd docs && poetry run make html && cd ..
+
+      - name: Upload coverage reports to Codecov
+        run: |
+          poetry run codecov
diff --git a/.github/workflows/package-publish.yml b/.github/workflows/package-publish.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.11"]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -11,9 +11,9 @@ sphinx:
 
 # Use mamba to reduce the memory consumption of the dependency solving process.
 build:
-  os: "ubuntu-20.04"
+  os: "ubuntu-22.04"
   tools:
-    python: "mambaforge-4.10"
+    python: "mambaforge-22.9"
 
 # Conda environment
 conda:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,14 @@ Changelog
 
 This packages uses `semantic versioning <https://semver.org/>`_.
 
+Version 0.4.0
+-------------
+
+- Features:
+    - Update to Python 3.11 and new numba version.
+- Bugfixes:
+    - Solve mypy issues with matplotlib figure. 
+
 Version 0.3.2
 -------------
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -71,16 +71,6 @@ def _get_project_meta():
 # html_theme = 'sphinx_rtd_theme'
 html_theme = "pydata_sphinx_theme"
 
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-html_theme_options = {
-    "external_links": [
-        {"name": "github_url", "url": "https://github.com/munterfi/glacier-flow-model"},
-        {"name": "twitter_url", "url": "https://twitter.com/munterfi1"},
-    ]
-}
-
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".

diff --git a/glacier_flow_model/data/access.py b/glacier_flow_model/data/access.py
@@ -2,7 +2,7 @@
 import importlib.resources as resources
 from logging import getLogger
 
-from rasterio import open
+from rasterio import open as open_raster
 from rasterio import DatasetReader
 
 LOG = getLogger(__name__)
@@ -21,7 +21,6 @@ def __init__(self) -> None:
             Constructor of the PkgDataAccess class.
 
         """
-        pass
 
     @staticmethod
     def locate_dem() -> str:
@@ -34,9 +33,10 @@ def locate_dem() -> str:
             The path to the file on the system.
 
         """
-        with resources.path("glacier_flow_model.data", "aletsch.tif") as file_path:
-            LOG.info("Example DEM at '%s' ...", file_path)
-            return str(file_path)
+        data_folder = resources.files("glacier_flow_model.data")
+        file_path = data_folder / "aletsch.tif"
+        LOG.info("Example DEM at '%s' ...", file_path)
+        return str(file_path)
 
     @staticmethod
     def load_dem() -> DatasetReader:
@@ -51,5 +51,5 @@ def load_dem() -> DatasetReader:
         """
         file_path = PkgDataAccess.locate_dem()
         LOG.info("Reading DEM from '%s' ...", file_path)
-        dem = open(file_path)
+        dem = open_raster(file_path)
         return dem