Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #171 - removed unnecessary dependency #172

Merged
merged 2 commits into from
Jul 9, 2024
Merged

Fixes #171 - removed unnecessary dependency #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72f897d
Fixes #171 - removed unnecessary dependency
navarroc Jul 3, 2024
1d3b74e
Changed the version of matplotlib
ywkim312 Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ 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)
- 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)
Expand Down
3 changes: 1 addition & 2 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,4 +23,3 @@ dependencies:
- pytest>=3.9.0
- python-jose>=3.0
- rasterio>=1.3.9
- openssl<=3.2.0
2 changes: 1 addition & 1 deletion pyincore_viz/geoutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion recipes/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.min
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,14 @@
'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',
'pandas>=2.1.2',
'pillow',
'pyincore>=1.11.0',
'rasterio>=1.3.9',
'openssl<=3.2.0'
],

extras_require={
Expand Down
Loading