Merge branch 'develop' into 143-create-visualization-for-local-hazard

IN-CORE · Dec 5, 2023 · 3cc0ce2 · 3cc0ce2
2 parents 6d797dd + e997fbc
commit 3cc0ce2
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 39 deletions.
diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml
@@ -36,10 +36,10 @@ jobs:
             echo "TOKEN=${{ secrets.TEST_PYPI_API_TOKEN }}" >> $GITHUB_ENV
           fi
 
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
 
       - name: Install dependencies
         run: |

diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
@@ -15,8 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        vars: [ { python-version: '3.8', sleep: '0s' }, { python-version: '3.9', sleep: '60s' } ]
-#                { python-version: '3.10', sleep: '120s' }, { python-version: '3.11', sleep: '180s' } ]
+        vars: [ { python-version: '3.9', sleep: '0s' }, { python-version: '3.10', sleep: '60s' },
+                { python-version: '3.11', sleep: '120s' }, { python-version: '3.12', sleep: '180s' } ]
     name: Python ${{ matrix.vars.python-version }} Test
     steps:
       - name: Checkout source code

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Local hazard visualization [#143](https://github.com/IN-CORE/pyincore-viz/issues/143)
 
+### Changed
+- Clean dependencies [#145](https://github.com/IN-CORE/pyincore-viz/issues/145)
+
 ## [1.8.4] - 2023-11-08
 ### Updated
 - Basemap api updated to use open street map [#138](https://github.com/IN-CORE/pyincore-viz/issues/138)

diff --git a/docs/README.md b/docs/README.md
@@ -40,7 +40,7 @@ In case of `conda`, the package management and deployment tool
 is called `anaconda`. Create the environment from the terminal at the project 
 folder (called `pyincore_viz` here) and activate it:
     ```
-    conda create -n pyincore_viz python=3.7
+    conda create -n pyincore_viz python=3.9
     conda activate pyincore_viz
     ```
     or  

diff --git a/environment.yml b/environment.yml
@@ -8,18 +8,18 @@ dependencies:
   - branca>=0.3.0
   - contextily>=1.0.0
   - deprecated
-  - geopandas>=0.6.1
+  - geopandas>=0.14.0
   - ipyleaflet>=0.16.0
   - ipywidgets>=7.6.0
   - lxml>=4.6.3
-  - matplotlib>=2.1.0
-  - networkx>=2.2
-  - numpy>=1.16.1
+  - matplotlib>=3.8.0
+  - networkx>=3.2.1
+  - numpy>=1.26.0,<2.0a0
   - owslib>=0.17.1
-  - pandas>=0.24.1
+  - pandas>=2.1.2
   - pillow
   - pycodestyle>=2.6.0
   - pyincore>=1.11.0
   - pytest>=3.9.0
   - python-jose>=3.0
-  - rasterio>=1.3.3
+  - rasterio>=1.3.9
diff --git a/recipes/meta.yaml b/recipes/meta.yaml
@@ -22,33 +22,33 @@ build:
 
 requirements:
   build:
-    - python>=3.6
+    - python>=3.9
     - pip
-    - numpy>=1.16.1
+    - numpy>=1.26.0,<2.0a0
 
   host:
-    - python>=3.6
+    - python>=3.9
     - pip
-    - numpy>=1.16.1
+    - numpy>=1.26.0,<2.0a0
 
   run:
-    - python>=3.6
+    - python>=3.9
     - {{ pin_compatible('numpy') }}
     - gdal
     - branca>=0.3.0
     - contextily>=1.0.0
     - deprecated
-    - geopandas>=0.6.1
+    - geopandas>=0.14.0
     - ipyleaflet>=0.16.0
     - ipywidgets>=7.6.0
     - lxml>=4.6.3
-    - matplotlib>=2.1.0
-    - networkx>=2.2
+    - matplotlib>=3.8.0
+    - networkx>=3.2.1
     - owslib>=0.17.1
-    - pandas>=0.24.1
+    - pandas>=2.1.2
     - pillow
     - pyincore>=1.11.0
-    - rasterio>=1.3.3
+    - rasterio>=1.3.9
 
 test:
   # Python imports

diff --git a/requirements.min b/requirements.min
@@ -2,18 +2,18 @@ branca>=0.3.0
 contextily>=1.0.0
 descartes>=1.1.0
 deprecated
-geopandas>=0.6.1
+geopandas>=0.14.0
 ipyleaflet>=0.16.0
 ipywidgets>=7.6.0
 lxml>=4.6.3
-matplotlib>=2.1.0
-networkx>=2.2
-numpy>=1.16.1
+matplotlib>=3.8.0
+networkx>=3.2.1
+numpy>=1.26.0,<2.0a0
 owslib>=0.17.1
-pandas>=0.24.1
+pandas>=2.1.2
 pillow
 pycodestyle>=2.6.0
 pyincore>=1.11.0
 pytest>=3.9.0
 python-jose>=3.0
-rasterio>=1.3.3
+rasterio>=1.3.9
diff --git a/requirements.txt b/requirements.txt
@@ -2,18 +2,18 @@
 branca>=0.3.0
 contextily>=1.0.0
 deprecated
-geopandas>=0.6.1
+geopandas>=0.14.0
 ipyleaflet>=0.16.0
 ipywidgets>=7.6.0
 lxml>=4.6.3
-matplotlib>=2.1.0
-networkx>=2.2
-numpy>=1.16.1
+matplotlib>=3.8.0
+networkx>=3.2.1
+numpy>=1.26.0,<2.0a0
 owslib>=0.17.1
-pandas>=0.24.1
+pandas>=2.1.2
 pillow
 pycodestyle>=2.6.0
 pyincore>=1.11.0
 pytest>=3.9.0
 python-jose>=3.0
-rasterio>=1.3.3
+rasterio>=1.3.9
diff --git a/setup.py b/setup.py
@@ -56,18 +56,18 @@
         'branca>=0.3.0',
         'contextily>=1.0.0',
         'deprecated',
-        'geopandas>=0.6.1',
+        'geopandas>=0.14.0',
         'ipyleaflet>=0.16.0',
         'ipywidgets>=7.6.0',
         'lxml>=4.6.3',
-        'matplotlib>=2.1.0',
-        'networkx>=2.2',
-        'numpy>=1.16.1',
+        'matplotlib>=3.8.0',
+        'networkx>=3.2.1',
+        'numpy>=1.26.0,<2.0a0',
         'owslib>=0.17.1',
-        'pandas>=0.24.1',
+        'pandas>=2.1.2',
         'pillow',
         'pyincore>=1.11.0',
-        'rasterio>=1.3.3'
+        'rasterio>=1.3.9'
     ],
 
     extras_require={