Skip to content

Commit

Permalink
Simplify dependencies
Browse files Browse the repository at this point in the history
Remove formatting and linting dependencies from the conda environment
since they are in pre-commit already.

Remove test dependencies from the conda environment
since they are in the Poetry dev dependencies already.

Remove code related to `importlib_metadata` on Python "<3.8".

Remove dependency version constraints for Python "<3.8"
since we only support Python ">=3.8,<3.11".

Remove setuptools and setuptools-scm from build dependencies
since they are superfluous.
  • Loading branch information
fabcor-maxiv committed Jan 19, 2024
1 parent f34b63f commit 46255a8
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 33 deletions.
8 changes: 0 additions & 8 deletions conda-environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,3 @@ dependencies:
# Dev
- pip
- poetry
# Format, lint
- black
- flake8
# Test
- coverage
- pytest
- pytest-cov
- pytest-mock
16 changes: 4 additions & 12 deletions mxcubecore/__version__.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
try:
# Python3.8+ standard library
from importlib.metadata import ( # pyright: ignore[reportMissingImports]
PackageNotFoundError,
version,
)
except ImportError:
# Python3.7 module backport
from importlib_metadata import (
PackageNotFoundError,
version, # pyright: ignore[reportMissingImports]
)
from importlib.metadata import ( # pyright: ignore[reportMissingImports]
PackageNotFoundError,
version,
)

__version__: str
try:
Expand Down
14 changes: 7 additions & 7 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,16 @@ greenlet = "^1.1.3"
jsonpickle = "^2.2.0"
jsonschema = "^4.17.1"
lxml = "^4.9.1"
matplotlib = [ { version = "3.5.3", python = "3.7" }, { version = "^3.6.2", python = ">=3.8" } ]
numpy = [ { version = "1.21.6", python = "3.7" }, { version = "^1.23.5", python = ">=3.8" } ]
matplotlib = "^3.6.2"
numpy = "^1.23.5"
Pillow = "^9.3.0"
pydantic = "^1.10.2"
PyDispatcher = "^2.0.6"
"ruamel.yaml" = "^0.17.21"
scipy = [ { version = "1.7.3", python = "3.7" }, { version = "^1.9.3", python = ">=3.8" } ]
scipy = "^1.9.3"
suds-py3 = "1.4.5.0"
psutil = "^5.9.4"
gipc = "^1.4.0"
importlib_metadata = { version = ">=4.12.0", python = "3.7" }
py4j = "0.10.9.7"
f90nml = "1.4.3"
lucid3 = "^3.0.0"
Expand All @@ -52,7 +51,7 @@ requests = "^2.31.0"
colorama = "^0.4.6"

[tool.poetry.dev-dependencies]
pylint = [ { version = "==2.13.9", python = "<=3.7.1" }, { version = "^2.15.6", python = ">=3.8" } ]
pylint = "^2.15.6"
pre-commit = "^2.20.0"
pytest = "^7.2.0"
pytest-cov = "^4.0.0"
Expand Down Expand Up @@ -248,5 +247,5 @@ force-exclude = '''
'''

[build-system]
requires = ["poetry-core>=1.0.0", "setuptools>=45", "setuptools_scm[toml]>=6.2"]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"

0 comments on commit 46255a8

Please sign in to comment.