WIP

conda-environment-dev.yml

@@ -9,11 +9,3 @@ dependencies:
   # Dev
   - pip
   - poetry
-  # Format, lint
-  - black
-  - flake8
-  # Test
-  - coverage
-  - pytest
-  - pytest-cov
-  - pytest-mock

mxcubecore/__version__.py

@@ -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:

pyproject.toml

@@ -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"
@@ -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"