Merge pull request #21883 from mahf708/zppy-zstash

add zppy + zstash to conda-forge

recipes/zppy/meta.yaml

@@ -0,0 +1,55 @@
+{% set name = "zppy" %}
+{% set version = "2.2.0" %}
+
+package:
+  name: {{ name|lower }}
+  version: {{ version }}
+
+source:
+  url: https://github.com/E3SM-Project/zppy/archive/v{{ version }}.tar.gz
+  sha256: a233512d612bef036f022b40c9b469eb6d28f6cfcf8f16ebf6dcae946df49d0a
+  patches: 
+    - patches/fix-setup-py.patch
+
+build:
+  number: 0
+  script: "{{ PYTHON }} -m pip install . --no-deps -vv"
+  noarch: python
+  entry_points:
+    - zppy = zppy.__main__:main
+
+requirements:
+  host:
+    - python >=3.6
+    - pip
+  run:
+    - python >=3.6
+    - configobj >=5.0.0,<6.0.0
+    - jinja2 >=2.0.0
+    - mache >=1.3.2
+    - mpas_tools >=0.15.0
+
+test:
+  requires:
+    - pip
+  imports:
+    - zppy
+  commands:
+    - zppy --help
+    - pip check
+
+about:
+  home: https://github.com/E3SM-Project/zppy
+  summary: 'E3SM post-processing toolchain'
+  license: BSD-3-Clause AND custom
+  license_file:
+    - LICENSE
+    - NOTICE
+
+extra:
+  recipe-maintainers:
+    - mahf708
+    - xylar
+    - tomvothecoder
+    - forsyth2
+    - chengzhuzhang

recipes/zppy/patches/fix-setup-py.patch

@@ -0,0 +1,24 @@
+From 2a97a6c2763714655387188a2333c7fc8538052b Mon Sep 17 00:00:00 2001
+From: Xylar Asay-Davis <[email protected]>
+Date: Fri, 27 Jan 2023 14:17:16 -0700
+Subject: [PATCH 1/3] Make `setup.py` consistent with conda recipe
+
+Inconsistencies in `setup.py` can cause `pip check` to fail
+on the conda package.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index bd283df..bb5feb9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -28,7 +28,7 @@ def package_files(directory, prefixes, extensions):
+     author_email="[email protected], [email protected]",
+     description="Post-processing software for E3SM",
+     python_requires=">=3.6",
+-    intall_requires=["configobj", "jinja2"],
++    intall_requires=["configobj>=5.0.0,<6.0.0", "jinja2>=2.0.0"],
+     packages=find_packages(include=["zppy", "zppy.*"]),
+     package_data={"": data_files},
+     entry_points={"console_scripts": ["zppy=zppy.__main__:main"]},

recipes/zstash/meta.yaml

@@ -0,0 +1,53 @@
+{% set name = "zstash" %}
+{% set version = "1.3.0" %}
+
+package:
+  name: {{ name|lower }}
+  version: {{ version }}
+
+source:
+  url: https://github.com/E3SM-Project/zstash/archive/v{{ version }}.tar.gz
+  sha256: 16d4169dcf49057ac86fb78410bffbc9ceba7680f73d4f88659992c18376cb63
+  patches: 
+    - patches/fix-setup-py.patch
+
+build:
+  number: 0
+  script: "{{ PYTHON }} -m pip install . --no-deps -vv"
+  noarch: python
+
+requirements:
+  host:
+    - python >=3.6
+    - pip
+
+  run:
+    - python >=3.6
+    - six
+    - globus-sdk >=3.0.0,<4.0.0
+    - fair-research-login >=0.2.6,<0.3.0
+
+test:
+  imports:
+    - zstash
+  commands:
+    - zstash --help
+    - pip check
+  requires:
+    - pip
+
+about:
+  home: https://github.com/E3SM-Project/zstash
+  summary: 'Long term HPSS archiving tool for E3SM'
+  license: BSD-3-Clause and custom
+  license_file:
+    - LICENSE
+    - NOTICE
+
+extra:
+  recipe-maintainers:
+    - mahf708
+    - xylar
+    - tomvothecoder
+    - forsyth2
+    - chengzhuzhang

recipes/zstash/patches/fix-setup-py.patch

@@ -0,0 +1,47 @@
+From 23de9b2d79b5b9ca93ff3606753f1da94712b7a0 Mon Sep 17 00:00:00 2001
+From: Xylar Asay-Davis <[email protected]>
+Date: Fri, 27 Jan 2023 14:12:11 -0700
+Subject: [PATCH] Make `conda/meta.yaml` and `setup.py` consistent
+
+Inconsistencies in `setup.py` are causing `pip check` to fail
+on the conda package.
+---
+ conda/meta.yaml | 4 ++--
+ setup.py        | 7 ++++---
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/conda/meta.yaml b/conda/meta.yaml
+index a0dc3b0..358f0d4 100644
+--- 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
+index 0b94541..00e4c53 100644
+--- 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"]},
+ )