Merge pull request #82 from mbakker7/dev

Release 6.2.0

Author: dbrakenhoff

.github/workflows/ci.yml

@@ -28,11 +28,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          if [ -f requirements.ci.txt ]; then pip install -r requirements.ci.txt; fi
-          pip install flake8 pytest
-          pip install pytest-cov
-          pip install coveralls
-          pip install -e .
+          pip install -e .[ci]
 
       - name: Lint with flake8
         run: |

.github/workflows/python-publish.yml

@@ -13,19 +13,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
         python-version: '3.x'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        pip install wheel twine build
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
+        python3 -m build
+        python3 -m twine upload --repository pypi dist/*

pyproject.toml

@@ -15,7 +15,7 @@ maintainers = [
     { name = "Davíd Brakenhoff", email = "d.brakenhoff@artesia-water.nl" },
 ]
 requires-python = ">= 3.7"
-dependencies = ["numpy>=1.12", "scipy>=0.19", "numba>=0.39", "matplotlib>=3.0"]
+dependencies = ["numpy>=1.20", "scipy>=0.19", "numba>=0.39", "matplotlib>=3.0"]
 
 keywords = ["hydrology", "groundwater", "model", "analytic element method"]
 classifiers = [
@@ -46,8 +46,11 @@ documentation = "http://mbakker7.github.io/timml/docs/builddocs/html/index.html"
 [project.optional-dependencies]
 ci = [
     "pytest>=4.6",
+    "pytest-cov",
     "jupyter>=1.0.0",
     "shapely",
+    "flake8",
+    "coveralls",
 ]
 
 [tool.setuptools]