diff --git a/CHANGELOG.md b/CHANGELOG.md index baf39b0..4678691 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Added - Apply Black formatter [#169](https://github.com/IN-CORE/pyincore-viz/issues/169) +### 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 - 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..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 @@ -23,4 +23,3 @@ dependencies: - pytest>=3.9.0 - python-jose>=3.0 - rasterio>=1.3.9 - - openssl<=3.2.0 diff --git a/pyincore_viz/geoutil.py b/pyincore_viz/geoutil.py index 40a0d3f..c9fa614 100644 --- a/pyincore_viz/geoutil.py +++ b/pyincore_viz/geoutil.py @@ -319,7 +319,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 4483297..336e576 100644 --- a/setup.py +++ b/setup.py @@ -47,22 +47,21 @@ include_package_data=True, package_data={"": ["*.ini"]}, install_requires=[ - "branca>=0.3.0", - "contextily>=1.0.0", - "deprecated", - "geopandas>=0.14.0", - "ipyleaflet>=0.16.0", - "ipywidgets>=7.6.0", - "lxml>=4.6.3", - "matplotlib>=3.8.0", - "networkx>=3.2.1", - "numpy>=1.26.0,<2.0a0", - "owslib>=0.17.1", - "pandas>=2.1.2", - "pillow", - "pyincore>=1.11.0", - "rasterio>=1.3.9", - "openssl<=3.2.0", + 'branca>=0.3.0', + 'contextily>=1.0.0', + 'deprecated', + 'geopandas>=0.14.0', + 'ipyleaflet>=0.16.0', + 'ipywidgets>=7.6.0', + 'lxml>=4.6.3', + 'matplotlib>=3.8.3', + 'networkx>=3.2.1', + 'numpy>=1.26.0,<2.0a0', + 'owslib>=0.17.1', + 'pandas>=2.1.2', + 'pillow', + 'pyincore>=1.11.0', + 'rasterio>=1.3.9', ], extras_require={ "test": [