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.

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

Drop deprecated pkg_resources #287

Merged
merged 3 commits into from
Sep 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@

- Python 3.7 is no longer supported

- Minimum version of scipy increased from 1.1 to 1.10
- Minimum version of scipy increased from 1.1 to 1.10

- This requires numpy >= 1.19.5
- This requires numpy >= 1.19.5

- Minimum version of pint increased from 0.10.1 to 0.19
- Minimum version of matplotlib increased from 2.2.2 to 3.2.0

- Minimum version of h5py increaased form 2.8 to 2.10
- Minimum version of pint increased from 0.10.1 to 0.19

- Minimum version of h5py increaased form 2.8 to 2.10

- Improvements

Expand Down
7 changes: 3 additions & 4 deletions euphonic/styles/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"""Matplotlib stylesheets for plot styling"""
from pkg_resources import resource_filename
from importlib_resources import files

base_style = resource_filename("euphonic.styles", "base.mplstyle")
intensity_widget_style = resource_filename("euphonic.styles",
"intensity_widget.mplstyle")
base_style = files(__package__) / "base.mplstyle"
intensity_widget_style = files(__package__) / "intensity_widget.mplstyle"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def run_setup():
'threadpoolctl>=1.0.0'
],
extras_require={
'matplotlib': ['matplotlib>=2.2.2'],
'matplotlib': ['matplotlib>=3.2.0'],
'phonopy_reader': ['h5py>=2.10.0', 'PyYAML>=3.13'],
'brille': ['brille>=0.7.0']
},
Expand Down
2 changes: 1 addition & 1 deletion tests_and_analysis/minimum_euphonic_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ spglib==1.9.4.2
seekpath==1.1.0
pint==0.19.0
importlib_resources==1.3.0
matplotlib==2.2.2
matplotlib==3.2.0
h5py==2.10.0
PyYAML==3.13
threadpoolctl==1.0.0