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

Switch from pkg_resources to packaging for parsing versions #72

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
1 change: 0 additions & 1 deletion environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ dependencies:
- sphinx-copybutton
- sphinx-inline-tabs
- sphinxcontrib-bibtex
- types-pkg_resources
- types-setuptools
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ channels:
dependencies:
- fire
- numpy
- packaging
- python>=3.8
- scipy
2 changes: 1 addition & 1 deletion morfeus/conformer.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import warnings

import numpy as np
from pkg_resources import parse_version
from packaging.version import parse as parse_version

from morfeus.data import (
HARTREE,
Expand Down
1 change: 0 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ sphinx
sphinx-copybutton
sphinx-inline-tabs
sphinxcontrib-bibtex
types-pkg_resources
types-setuptools
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
numpy
packaging
scipy
fire
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
packages=["morfeus"],
package_data={"morfeus": ["py.typed"]},
python_requires=">=3.8",
install_requires=["fire", "numpy", "scipy"],
install_requires=["fire", "numpy", "packaging", "scipy"],
license="MIT",
classifiers=[
"Programming Language :: Python :: 3",
Expand Down