From 72f897ddcc0ac109e8ca519587d07727d7fc9b3a Mon Sep 17 00:00:00 2001 From: Chris Navarro Date: Wed, 3 Jul 2024 14:25:16 -0500 Subject: [PATCH 1/2] Fixes #171 - removed unnecessary dependency --- CHANGELOG.md | 5 +++++ environment.yml | 1 - setup.py | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1601e31..4730469 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ 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] + +### Fixed +- Unnecessary dependency in setup.py [#171](https://github.com/IN-CORE/pyincore-viz/issues/171) + ## [1.10.1] - 2023-06-12 ### Added - Google Analytics to the documentation site [#164](https://github.com/IN-CORE/pyincore-viz/issues/164) diff --git a/environment.yml b/environment.yml index 8a52593..559f94a 100644 --- a/environment.yml +++ b/environment.yml @@ -23,4 +23,3 @@ dependencies: - pytest>=3.9.0 - python-jose>=3.0 - rasterio>=1.3.9 - - openssl<=3.2.0 diff --git a/setup.py b/setup.py index 2722b3e..65dbdc5 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,6 @@ 'pillow', 'pyincore>=1.11.0', 'rasterio>=1.3.9', - 'openssl<=3.2.0' ], extras_require={ From 1d3b74ec85feeb587cee5505e2644af41605037b Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Tue, 9 Jul 2024 10:18:20 -0500 Subject: [PATCH 2/2] Changed the version of matplotlib --- CHANGELOG.md | 1 + environment.yml | 2 +- pyincore_viz/geoutil.py | 2 +- recipes/meta.yaml | 2 +- requirements.min | 2 +- requirements.txt | 2 +- setup.py | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4730469..80e7262 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Unnecessary dependency in setup.py [#171](https://github.com/IN-CORE/pyincore-viz/issues/171) +- Matplotlib version incompatibility by upgrade in geoutil [#173](https://github.com/IN-CORE/pyincore-viz/issues/173) ## [1.10.1] - 2023-06-12 ### Added diff --git a/environment.yml b/environment.yml index 559f94a..9102bde 100644 --- a/environment.yml +++ b/environment.yml @@ -12,7 +12,7 @@ dependencies: - ipyleaflet>=0.16.0 - ipywidgets>=7.6.0 - lxml>=4.6.3 - - matplotlib>=3.8.0 + - matplotlib>=3.8.3 - networkx>=3.2.1 - numpy>=1.26.0,<2.0a0 - owslib>=0.17.1 diff --git a/pyincore_viz/geoutil.py b/pyincore_viz/geoutil.py index 63ee057..99dea58 100644 --- a/pyincore_viz/geoutil.py +++ b/pyincore_viz/geoutil.py @@ -266,7 +266,7 @@ def plot_raster_file_with_legend(file_path, title=None): max = earthquake_nd.max() # Define the default viridis colormap for viz - viz_cmap = cm.get_cmap('viridis', 256) + viz_cmap = plt.get_cmap('viridis', 256) earthquake_nd = np.flip(earthquake_nd, axis=0) diff --git a/recipes/meta.yaml b/recipes/meta.yaml index 0a7953c..fd66442 100644 --- a/recipes/meta.yaml +++ b/recipes/meta.yaml @@ -42,7 +42,7 @@ requirements: - ipyleaflet>=0.16.0 - ipywidgets>=7.6.0 - lxml>=4.6.3 - - matplotlib>=3.8.0 + - matplotlib>=3.8.3 - networkx>=3.2.1 - owslib>=0.17.1 - pandas>=2.1.2 diff --git a/requirements.min b/requirements.min index 82f572c..2c88ec3 100644 --- a/requirements.min +++ b/requirements.min @@ -6,7 +6,7 @@ geopandas>=0.14.0 ipyleaflet>=0.16.0 ipywidgets>=7.6.0 lxml>=4.6.3 -matplotlib>=3.8.0 +matplotlib>=3.8.3 networkx>=3.2.1 numpy>=1.26.0,<2.0a0 owslib>=0.17.1 diff --git a/requirements.txt b/requirements.txt index 3ccfe10..0ddb72b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ geopandas>=0.14.0 ipyleaflet>=0.16.0 ipywidgets>=7.6.0 lxml>=4.6.3 -matplotlib>=3.8.0 +matplotlib>=3.8.3 networkx>=3.2.1 numpy>=1.26.0,<2.0a0 owslib>=0.17.1 diff --git a/setup.py b/setup.py index 65dbdc5..1926993 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ 'ipyleaflet>=0.16.0', 'ipywidgets>=7.6.0', 'lxml>=4.6.3', - 'matplotlib>=3.8.0', + 'matplotlib>=3.8.3', 'networkx>=3.2.1', 'numpy>=1.26.0,<2.0a0', 'owslib>=0.17.1',