Use 'packaging' package for parse_version

MolSSI · Oct 25, 2023 · 76a2cd8 · 76a2cd8
1 parent bcefe2c
commit 76a2cd8
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 3 deletions.
diff --git a/conda-build/qcportal/meta.yaml b/conda-build/qcportal/meta.yaml
@@ -32,6 +32,7 @@ requirements:
     - tqdm
     - pandas
     - pyjwt
+    - packaging
 
 
 test:

diff --git a/qcarchivetesting/conda-envs/fulltest_qcportal.yaml b/qcarchivetesting/conda-envs/fulltest_qcportal.yaml
@@ -15,4 +15,5 @@ dependencies:
   - tabulate
   - tqdm
   - pandas
-  - pyjwt
+  - pyjwt
+  - packaging
diff --git a/qcarchivetesting/conda-envs/fulltest_server.yaml b/qcarchivetesting/conda-envs/fulltest_server.yaml
@@ -20,6 +20,7 @@ dependencies:
   - tqdm
   - pandas
   - pyjwt
+  - packaging
 
   # QCFractal dependencies
   - flask

diff --git a/qcarchivetesting/conda-envs/fulltest_snowflake.yaml b/qcarchivetesting/conda-envs/fulltest_snowflake.yaml
@@ -9,6 +9,7 @@ dependencies:
   - postgresql
 
   # QCPortal dependencies
+  # NOTE: msgpack-python in conda is msgpack in pypi (due to a rename around v0.5)
   - numpy
   - msgpack-python
   - requests
@@ -20,6 +21,7 @@ dependencies:
   - tqdm
   - pandas
   - pyjwt
+  - packaging
 
   # QCFractalCompute dependencies
   - parsl

diff --git a/qcarchivetesting/conda-envs/fulltest_worker.yaml b/qcarchivetesting/conda-envs/fulltest_worker.yaml
@@ -20,6 +20,7 @@ dependencies:
   - tqdm
   - pandas
   - pyjwt
+  - packaging
 
   # QCFractalCompute dependencies
   - parsl

diff --git a/qcfractalcompute/qcfractalcompute/compute_manager.py b/qcfractalcompute/qcfractalcompute/compute_manager.py
@@ -12,11 +12,11 @@
 
 import parsl.executors.high_throughput.interchange
 import tabulate
+from packaging.version import parse as parse_version
 from parsl.config import Config as ParslConfig
 from parsl.dataflow.dflow import DataFlowKernel
 from parsl.dataflow.futures import Future as ParslFuture
 from parsl.executors import HighThroughputExecutor, ThreadPoolExecutor
-from pkg_resources import parse_version
 from pydantic import BaseModel, Extra, Field
 from requests.exceptions import Timeout
 

diff --git a/qcportal/pyproject.toml b/qcportal/pyproject.toml
@@ -32,6 +32,7 @@ dependencies = [
     "tqdm",
     "pandas",
     "pyjwt",
+    "packaging",
 ]
 
 

diff --git a/qcportal/qcportal/client_base.py b/qcportal/qcportal/client_base.py
@@ -17,7 +17,7 @@
 import pydantic
 import requests
 import yaml
-from pkg_resources import parse_version
+from packaging.version import parse as parse_version
 
 from . import __version__
 from .exceptions import AuthenticationFailure
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,7 @@ requirements: @@
         - tqdm
         - pandas
         - pyjwt
+        - packaging
     test:
@@ Expand Down @@