From e997fbc4ee665a6c8066331b02581ce6c1e8d908 Mon Sep 17 00:00:00 2001 From: Ya-Lan Yang <63822845+ylyangtw@users.noreply.github.com> Date: Tue, 5 Dec 2023 14:07:53 -0600 Subject: [PATCH] 145 clean dependency (#148) * upgrade python to 3.9 * updated python to 3.9; added pytest for python 3.9/3.10/3.11/3.12 * fixed workflow typo * updated dependencies * Update CHANGELOG.md --- .github/workflows/pypi.yaml | 4 ++-- .github/workflows/pytest.yaml | 4 ++-- CHANGELOG.md | 4 ++++ docs/README.md | 2 +- environment.yml | 12 ++++++------ recipes/meta.yaml | 20 ++++++++++---------- requirements.min | 12 ++++++------ requirements.txt | 12 ++++++------ setup.py | 12 ++++++------ 9 files changed, 43 insertions(+), 39 deletions(-) diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml index aa3a034..7f32462 100644 --- 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 index f5a0cab..ed57ed6 100644 --- 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 index 8b5f00a..dc2350b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased] +### 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 index 37bb70b..cf89873 100644 --- 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 index f20c310..559f94a 100644 --- 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 index fffacb0..0da1e18 100644 --- 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 index ce79a55..82f572c 100644 --- 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 index 31d2d55..3ccfe10 100644 --- 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 index df9988b..1ad1233 100644 --- 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={