Make conda/meta.yaml and setup.py consistent

Inconsistencies in `setup.py` are causing `pip check` to fail on the conda package.
E3SM-Project · Feb 2, 2023 · 23de9b2 · 23de9b2
1 parent 215eb56
commit 23de9b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -21,9 +21,9 @@ requirements:
 
   run:
     - python >=3.6
+    - fair-research-login >=0.2.6,<0.3.0
+    - globus-sdk >=3.0.0,<4.0.0
     - six
-    - globus-sdk >=2
-    - fair-research-login
 
 test:
   imports:

diff --git a/setup.py b/setup.py
@@ -7,10 +7,11 @@
     author_email="[email protected], [email protected], [email protected]",
     description="Long term HPSS archiving software for E3SM",
     packages=find_packages(include=["zstash", "zstash.*"]),
+    python_requires=">=3.6",
     install_requires=[
-        "six==1.16.0",
-        "globus-sdk<4.0.0>=3.0.0",
-        "fair-research-login==0.2.6",
+        "fair-research-login>=0.2.6,<0.3.0",
+        "globus-sdk>=3.0.0,<4.0.0",
+        "six",
     ],
     entry_points={"console_scripts": ["zstash=zstash.main:main"]},
 )