From a5f9432a5be0b3ade69e1d25119ff7b79f533277 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Fri, 27 Jan 2023 09:57:32 -0800 Subject: [PATCH 01/21] zppy + zstash draft --- recipes/zppy/meta.yaml | 44 +++++++++++++++++++++++++++++++++++++ recipes/zstash/meta.yaml | 47 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 recipes/zppy/meta.yaml create mode 100644 recipes/zstash/meta.yaml diff --git a/recipes/zppy/meta.yaml b/recipes/zppy/meta.yaml new file mode 100644 index 0000000000000..adc9a1efe9a09 --- /dev/null +++ b/recipes/zppy/meta.yaml @@ -0,0 +1,44 @@ +{% 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 + +build: + entry_points: + - zppy=zppy.__main__:main + noarch: python + script: {{ PYTHON }} -m pip install . -vv + number: 0 + +requirements: + host: + - python >=3.6 + - pip + run: + - python >=3.6 + +test: + imports: + - zppy + commands: + - pip check + - zppy --help + requires: + - pip + +about: + license: BSD-3-Clause AND Unlicense + license_file: + - LICENSE + - NOTICE + +extra: + recipe-maintainers: + - mahf708 + - xylar diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml new file mode 100644 index 0000000000000..efff5dc02c722 --- /dev/null +++ b/recipes/zstash/meta.yaml @@ -0,0 +1,47 @@ +{% 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 + +build: + entry_points: + - zstash=zstash.main:main + noarch: python + script: {{ PYTHON }} -m pip install . -vv + number: 0 + +requirements: + host: + - python + - pip + run: + - python + - six ==1.16.0 + - globus-sdk <4.0.0>=3.0.0 + - fair-research-login ==0.2.6 + +test: + imports: + - zstash + commands: + - pip check + - zstash --help + requires: + - pip + +about: + license: Unlicense AND BSD-3-Clause + license_file: + - LICENSE + - NOTICE + +extra: + recipe-maintainers: + - mahf708 + - xylar From 96cf0961355a7d6af28189d272cb5a265e2d1074 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Fri, 27 Jan 2023 10:09:39 -0800 Subject: [PATCH 02/21] add extra maintainers --- recipes/zppy/meta.yaml | 3 +++ recipes/zstash/meta.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/recipes/zppy/meta.yaml b/recipes/zppy/meta.yaml index adc9a1efe9a09..68c5af90be022 100644 --- a/recipes/zppy/meta.yaml +++ b/recipes/zppy/meta.yaml @@ -42,3 +42,6 @@ extra: recipe-maintainers: - mahf708 - xylar + - tomvothecoder + - forsyth2 + - chengzhuzhang. \ No newline at end of file diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml index efff5dc02c722..cb1deac399413 100644 --- a/recipes/zstash/meta.yaml +++ b/recipes/zstash/meta.yaml @@ -45,3 +45,6 @@ extra: recipe-maintainers: - mahf708 - xylar + - tomvothecoder + - forsyth2 + - chengzhuzhang. \ No newline at end of file From 7eb29993599beb9dfc02d7b6dd92fe3fa82b68d5 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Fri, 27 Jan 2023 10:11:36 -0800 Subject: [PATCH 03/21] lint --- recipes/zppy/meta.yaml | 2 ++ recipes/zstash/meta.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/recipes/zppy/meta.yaml b/recipes/zppy/meta.yaml index 68c5af90be022..1847ec9229343 100644 --- a/recipes/zppy/meta.yaml +++ b/recipes/zppy/meta.yaml @@ -33,6 +33,8 @@ test: - pip about: + home: https://github.com/E3SM-Project/zppy + summary: 'E3SM post-processing toolchain' license: BSD-3-Clause AND Unlicense license_file: - LICENSE diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml index cb1deac399413..a4d5718e8d7e0 100644 --- a/recipes/zstash/meta.yaml +++ b/recipes/zstash/meta.yaml @@ -36,6 +36,8 @@ test: - pip about: + home: https://github.com/E3SM-Project/zstash + summary: 'Long term HPSS archiving tool for E3SM' license: Unlicense AND BSD-3-Clause license_file: - LICENSE From 09c48310777580626376c2c4152b8a6cc71942bd Mon Sep 17 00:00:00 2001 From: mahf708 Date: Fri, 27 Jan 2023 10:11:48 -0800 Subject: [PATCH 04/21] typo --- recipes/zppy/meta.yaml | 2 +- recipes/zstash/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/zppy/meta.yaml b/recipes/zppy/meta.yaml index 1847ec9229343..eb2c65c94d3a6 100644 --- a/recipes/zppy/meta.yaml +++ b/recipes/zppy/meta.yaml @@ -46,4 +46,4 @@ extra: - xylar - tomvothecoder - forsyth2 - - chengzhuzhang. \ No newline at end of file + - chengzhuzhang \ No newline at end of file diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml index a4d5718e8d7e0..a89fd819bfc33 100644 --- a/recipes/zstash/meta.yaml +++ b/recipes/zstash/meta.yaml @@ -49,4 +49,4 @@ extra: - xylar - tomvothecoder - forsyth2 - - chengzhuzhang. \ No newline at end of file + - chengzhuzhang \ No newline at end of file From f0f4c0f524db261893ef4b52ee1d055f200a65aa Mon Sep 17 00:00:00 2001 From: mahf708 Date: Fri, 27 Jan 2023 10:12:12 -0800 Subject: [PATCH 05/21] lin t --- recipes/zppy/meta.yaml | 2 +- recipes/zstash/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/zppy/meta.yaml b/recipes/zppy/meta.yaml index eb2c65c94d3a6..893402d32a059 100644 --- a/recipes/zppy/meta.yaml +++ b/recipes/zppy/meta.yaml @@ -46,4 +46,4 @@ extra: - xylar - tomvothecoder - forsyth2 - - chengzhuzhang \ No newline at end of file + - chengzhuzhang diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml index a89fd819bfc33..fe496ab94aa09 100644 --- a/recipes/zstash/meta.yaml +++ b/recipes/zstash/meta.yaml @@ -49,4 +49,4 @@ extra: - xylar - tomvothecoder - forsyth2 - - chengzhuzhang \ No newline at end of file + - chengzhuzhang From 23a4927295b293c79a3da5247945f307677b0bfc Mon Sep 17 00:00:00 2001 From: mahf708 Date: Fri, 27 Jan 2023 10:14:01 -0800 Subject: [PATCH 06/21] min python version --- recipes/zstash/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml index fe496ab94aa09..647a9aeaf3358 100644 --- a/recipes/zstash/meta.yaml +++ b/recipes/zstash/meta.yaml @@ -18,10 +18,10 @@ build: requirements: host: - - python + - python >=3.7 - pip run: - - python + - python >=3.7 - six ==1.16.0 - globus-sdk <4.0.0>=3.0.0 - fair-research-login ==0.2.6 From f69dd09ade6cb74b21cebc708b0c3fba58f43963 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Fri, 27 Jan 2023 10:16:35 -0800 Subject: [PATCH 07/21] add deps for zppy --- recipes/zppy/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/zppy/meta.yaml b/recipes/zppy/meta.yaml index 893402d32a059..194735ecc82dc 100644 --- a/recipes/zppy/meta.yaml +++ b/recipes/zppy/meta.yaml @@ -22,6 +22,8 @@ requirements: - pip run: - python >=3.6 + - configobj + - jinja2 test: imports: From 958d2476159a27da24211ca4a5106900c6439993 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Fri, 27 Jan 2023 10:21:37 -0800 Subject: [PATCH 08/21] fix typo --- recipes/zstash/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml index 647a9aeaf3358..92e1a4bb6ba93 100644 --- a/recipes/zstash/meta.yaml +++ b/recipes/zstash/meta.yaml @@ -23,7 +23,7 @@ requirements: run: - python >=3.7 - six ==1.16.0 - - globus-sdk <4.0.0>=3.0.0 + - globus-sdk <4.0.0,>=3.0.0 - fair-research-login ==0.2.6 test: From 6a886394b90d97e8a2e7c8e8f0456ea0b4151a03 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Fri, 27 Jan 2023 10:34:15 -0800 Subject: [PATCH 09/21] copy recipes from upstream --- recipes/zppy/meta.yaml | 24 +++++++++++++----------- recipes/zstash/meta.yaml | 23 +++++++++++------------ 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/recipes/zppy/meta.yaml b/recipes/zppy/meta.yaml index 194735ecc82dc..b255976af0366 100644 --- a/recipes/zppy/meta.yaml +++ b/recipes/zppy/meta.yaml @@ -6,15 +6,15 @@ package: version: {{ version }} source: - url: https://github.com/E3SM-Project/zppy/archive/v{{ version }}.tar.gz - sha256: a233512d612bef036f022b40c9b469eb6d28f6cfcf8f16ebf6dcae946df49d0a + git_url: https://github.com/E3SM-Project/zppy.git + git_rev: v{{ version }} build: - entry_points: - - zppy=zppy.__main__:main - noarch: python - script: {{ PYTHON }} -m pip install . -vv number: 0 + script: "{{ PYTHON }} -m pip install . --no-deps -vv" + noarch: python + entry_points: + - zppy = zppy.__main__:main requirements: host: @@ -22,17 +22,19 @@ requirements: - pip run: - python >=3.6 - - configobj - - jinja2 + - 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: - - pip check - zppy --help - requires: - - pip + - pip check about: home: https://github.com/E3SM-Project/zppy diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml index 92e1a4bb6ba93..b80aa45402d24 100644 --- a/recipes/zstash/meta.yaml +++ b/recipes/zstash/meta.yaml @@ -6,32 +6,31 @@ package: version: {{ version }} source: - url: https://github.com/E3SM-Project/zstash/archive/v{{ version }}.tar.gz - sha256: 16d4169dcf49057ac86fb78410bffbc9ceba7680f73d4f88659992c18376cb63 + git_url: https://github.com/E3SM-Project/zstash.git + git_rev: v{{ version }} build: - entry_points: - - zstash=zstash.main:main - noarch: python - script: {{ PYTHON }} -m pip install . -vv number: 0 + script: "{{ PYTHON }} -m pip install . --no-deps -vv" + noarch: python requirements: host: - - python >=3.7 + - python >=3.6 - pip + run: - - python >=3.7 - - six ==1.16.0 - - globus-sdk <4.0.0,>=3.0.0 - - fair-research-login ==0.2.6 + - python >=3.6 + - six + - globus-sdk >=2 + - fair-research-login test: imports: - zstash commands: - - pip check - zstash --help + - pip check requires: - pip From 7b3a376a7530006f867fea3b5903eb957afad74a Mon Sep 17 00:00:00 2001 From: mahf708 Date: Sat, 28 Jan 2023 08:41:02 -0800 Subject: [PATCH 10/21] skip pip check pending upstream PRs --- recipes/zppy/meta.yaml | 3 ++- recipes/zstash/meta.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/zppy/meta.yaml b/recipes/zppy/meta.yaml index b255976af0366..ec6590d64c195 100644 --- a/recipes/zppy/meta.yaml +++ b/recipes/zppy/meta.yaml @@ -34,7 +34,8 @@ test: - zppy commands: - zppy --help - - pip check + # will reenable after E3SM-Project/zppy#395 + # - pip check about: home: https://github.com/E3SM-Project/zppy diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml index b80aa45402d24..1a8b9ddc40e3f 100644 --- a/recipes/zstash/meta.yaml +++ b/recipes/zstash/meta.yaml @@ -30,7 +30,8 @@ test: - zstash commands: - zstash --help - - pip check + # will reenable after E3SM-Project/zstash#250 + # - pip check requires: - pip From b5ef3be263ce6995b90a493dbd7a1a18cf74661a Mon Sep 17 00:00:00 2001 From: mahf708 Date: Sat, 28 Jan 2023 12:22:01 -0800 Subject: [PATCH 11/21] use tar + add patches --- recipes/zppy/meta.yaml | 8 +++--- recipes/zppy/patches/fix-setup-py.patch | 24 ++++++++++++++++++ recipes/zstash/meta.yaml | 8 +++--- recipes/zstash/patches/fix-setup-py.patch | 30 +++++++++++++++++++++++ 4 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 recipes/zppy/patches/fix-setup-py.patch create mode 100644 recipes/zstash/patches/fix-setup-py.patch diff --git a/recipes/zppy/meta.yaml b/recipes/zppy/meta.yaml index ec6590d64c195..c73b97a132f5d 100644 --- a/recipes/zppy/meta.yaml +++ b/recipes/zppy/meta.yaml @@ -6,8 +6,10 @@ package: version: {{ version }} source: - git_url: https://github.com/E3SM-Project/zppy.git - git_rev: v{{ version }} + url: https://github.com/E3SM-Project/zppy/archive/v{{ version }}.tar.gz + sha256: a233512d612bef036f022b40c9b469eb6d28f6cfcf8f16ebf6dcae946df49d0a + patches: + - patches/fix-setup-py.patch build: number: 0 @@ -35,7 +37,7 @@ test: commands: - zppy --help # will reenable after E3SM-Project/zppy#395 - # - pip check + - pip check about: home: https://github.com/E3SM-Project/zppy diff --git a/recipes/zppy/patches/fix-setup-py.patch b/recipes/zppy/patches/fix-setup-py.patch new file mode 100644 index 0000000000000..7519c76421a72 --- /dev/null +++ b/recipes/zppy/patches/fix-setup-py.patch @@ -0,0 +1,24 @@ +From 2a97a6c2763714655387188a2333c7fc8538052b Mon Sep 17 00:00:00 2001 +From: Xylar Asay-Davis +Date: Fri, 27 Jan 2023 14:17:16 -0700 +Subject: [PATCH] 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="forsyth2@llnl.gov, golaz1@llnl.gov", + 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"]}, \ No newline at end of file diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml index 1a8b9ddc40e3f..fb44a6f24c8e7 100644 --- a/recipes/zstash/meta.yaml +++ b/recipes/zstash/meta.yaml @@ -6,8 +6,10 @@ package: version: {{ version }} source: - git_url: https://github.com/E3SM-Project/zstash.git - git_rev: v{{ version }} + url: https://github.com/E3SM-Project/zstash/archive/v{{ version }}.tar.gz + sha256: 16d4169dcf49057ac86fb78410bffbc9ceba7680f73d4f88659992c18376cb63 + patches: + - patches/fix-setup-py.patch build: number: 0 @@ -31,7 +33,7 @@ test: commands: - zstash --help # will reenable after E3SM-Project/zstash#250 - # - pip check + - pip check requires: - pip diff --git a/recipes/zstash/patches/fix-setup-py.patch b/recipes/zstash/patches/fix-setup-py.patch new file mode 100644 index 0000000000000..5151ebb4de41f --- /dev/null +++ b/recipes/zstash/patches/fix-setup-py.patch @@ -0,0 +1,30 @@ +From bcdf84b4889777daf9ebb73a7d7e25c974f210e8 Mon Sep 17 00:00:00 2001 +From: Xylar Asay-Davis +Date: Fri, 27 Jan 2023 14:12:11 -0700 +Subject: [PATCH] Make `setup.py` consistent with conda recipe + +Inconsistencies in `setup.py` are causing `pip check` to fail +on the conda package. +--- + setup.py | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 0b94541..b58033c 100644 +--- a/setup.py ++++ b/setup.py +@@ -7,10 +7,11 @@ + author_email="forsyth2@llnl.gov, golaz1@llnl.gov, shaheen2@llnl.gov", + 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", ++ "six", ++ "globus-sdk>=2.0.0", ++ "fair-research-login", + ], + entry_points={"console_scripts": ["zstash=zstash.main:main"]}, + ) \ No newline at end of file From 454ab5c524892ad5d4eb8d4fc01ea77691273747 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Sat, 28 Jan 2023 12:31:42 -0800 Subject: [PATCH 12/21] call license "custom" Co-authored-by: Xylar Asay-Davis --- recipes/zppy/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/zppy/meta.yaml b/recipes/zppy/meta.yaml index c73b97a132f5d..099eddb863254 100644 --- a/recipes/zppy/meta.yaml +++ b/recipes/zppy/meta.yaml @@ -42,7 +42,7 @@ test: about: home: https://github.com/E3SM-Project/zppy summary: 'E3SM post-processing toolchain' - license: BSD-3-Clause AND Unlicense + license: BSD-3-Clause AND custom license_file: - LICENSE - NOTICE From ca301107d3dca5666dc8727390742c4038eea1ae Mon Sep 17 00:00:00 2001 From: mahf708 Date: Sat, 28 Jan 2023 12:31:54 -0800 Subject: [PATCH 13/21] call license "custom" Co-authored-by: Xylar Asay-Davis --- recipes/zstash/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml index fb44a6f24c8e7..8f0d975cc7411 100644 --- a/recipes/zstash/meta.yaml +++ b/recipes/zstash/meta.yaml @@ -40,7 +40,7 @@ test: about: home: https://github.com/E3SM-Project/zstash summary: 'Long term HPSS archiving tool for E3SM' - license: Unlicense AND BSD-3-Clause + license: BSD-3-Clause and custom license_file: - LICENSE - NOTICE From fe158999f0f864750f2de2726eb97f4ec487cca9 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Sat, 28 Jan 2023 12:54:24 -0800 Subject: [PATCH 14/21] run the test suite --- recipes/zppy/meta.yaml | 3 +++ recipes/zstash/meta.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/recipes/zppy/meta.yaml b/recipes/zppy/meta.yaml index 099eddb863254..c37f09766e483 100644 --- a/recipes/zppy/meta.yaml +++ b/recipes/zppy/meta.yaml @@ -38,6 +38,9 @@ test: - zppy --help # will reenable after E3SM-Project/zppy#395 - pip check + - ${PYTHON} -m unittest tests/test_*.py + source_files: + - tests about: home: https://github.com/E3SM-Project/zppy diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml index 8f0d975cc7411..32d15be85583e 100644 --- a/recipes/zstash/meta.yaml +++ b/recipes/zstash/meta.yaml @@ -34,6 +34,9 @@ test: - zstash --help # will reenable after E3SM-Project/zstash#250 - pip check + - ${PYTHON} -m unittest tests/test_*.py + source_files: + - tests requires: - pip From e725c88bf677e5170c4f9e9543f0a4c6f341fc88 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Tue, 31 Jan 2023 08:16:45 -0800 Subject: [PATCH 15/21] remove tests, only applicable on hpc --- recipes/zppy/meta.yaml | 4 ---- recipes/zstash/meta.yaml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/recipes/zppy/meta.yaml b/recipes/zppy/meta.yaml index c37f09766e483..0125befeaf172 100644 --- a/recipes/zppy/meta.yaml +++ b/recipes/zppy/meta.yaml @@ -36,11 +36,7 @@ test: - zppy commands: - zppy --help - # will reenable after E3SM-Project/zppy#395 - pip check - - ${PYTHON} -m unittest tests/test_*.py - source_files: - - tests about: home: https://github.com/E3SM-Project/zppy diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml index 32d15be85583e..ba6543d0d5a34 100644 --- a/recipes/zstash/meta.yaml +++ b/recipes/zstash/meta.yaml @@ -32,11 +32,7 @@ test: - zstash commands: - zstash --help - # will reenable after E3SM-Project/zstash#250 - pip check - - ${PYTHON} -m unittest tests/test_*.py - source_files: - - tests requires: - pip From 0c71d1a40e99c31b91b9033b73445061df807ebb Mon Sep 17 00:00:00 2001 From: mahf708 Date: Thu, 2 Feb 2023 17:09:32 -0800 Subject: [PATCH 16/21] fair-research-login pins Co-authored-by: Xylar Asay-Davis --- recipes/zstash/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml index ba6543d0d5a34..efac1653efb78 100644 --- a/recipes/zstash/meta.yaml +++ b/recipes/zstash/meta.yaml @@ -25,7 +25,7 @@ requirements: - python >=3.6 - six - globus-sdk >=2 - - fair-research-login + - fair-research-login >=0.2.6,<0.3.0 test: imports: From ce443c98bcf04b44cb88404f5084bba406a72282 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Thu, 2 Feb 2023 17:10:08 -0800 Subject: [PATCH 17/21] globus-sdk pins Co-authored-by: Xylar Asay-Davis --- recipes/zstash/patches/fix-setup-py.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/zstash/patches/fix-setup-py.patch b/recipes/zstash/patches/fix-setup-py.patch index 5151ebb4de41f..15dec8e14f49e 100644 --- a/recipes/zstash/patches/fix-setup-py.patch +++ b/recipes/zstash/patches/fix-setup-py.patch @@ -23,7 +23,7 @@ index 0b94541..b58033c 100644 - "globus-sdk<4.0.0>=3.0.0", - "fair-research-login==0.2.6", + "six", -+ "globus-sdk>=2.0.0", ++ "globus-sdk>=3.0.0,<4.0.0", + "fair-research-login", ], entry_points={"console_scripts": ["zstash=zstash.main:main"]}, From 04de1f4a4b7c3438b463926436258bbbd4dc782f Mon Sep 17 00:00:00 2001 From: mahf708 Date: Thu, 2 Feb 2023 17:10:56 -0800 Subject: [PATCH 18/21] globus-sdk pins Co-authored-by: Xylar Asay-Davis --- recipes/zstash/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/zstash/meta.yaml b/recipes/zstash/meta.yaml index efac1653efb78..1dc7d4476286a 100644 --- a/recipes/zstash/meta.yaml +++ b/recipes/zstash/meta.yaml @@ -24,7 +24,7 @@ requirements: run: - python >=3.6 - six - - globus-sdk >=2 + - globus-sdk >=3.0.0,<4.0.0 - fair-research-login >=0.2.6,<0.3.0 test: From 9d9c32271f1c4c5ee122432284dfd0fd2777e7a2 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Thu, 2 Feb 2023 19:09:44 -0800 Subject: [PATCH 19/21] update zstash patch --- recipes/zstash/patches/fix-setup-py.patch | 33 +++++++++++++++++------ 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/recipes/zstash/patches/fix-setup-py.patch b/recipes/zstash/patches/fix-setup-py.patch index 15dec8e14f49e..b948ef6b2de02 100644 --- a/recipes/zstash/patches/fix-setup-py.patch +++ b/recipes/zstash/patches/fix-setup-py.patch @@ -1,16 +1,33 @@ -From bcdf84b4889777daf9ebb73a7d7e25c974f210e8 Mon Sep 17 00:00:00 2001 +From 23de9b2d79b5b9ca93ff3606753f1da94712b7a0 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Fri, 27 Jan 2023 14:12:11 -0700 -Subject: [PATCH] Make `setup.py` consistent with conda recipe +Subject: [PATCH] Make `conda/meta.yaml` and `setup.py` consistent Inconsistencies in `setup.py` are causing `pip check` to fail on the conda package. --- - setup.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) + 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..b58033c 100644 +index 0b94541..00e4c53 100644 --- a/setup.py +++ b/setup.py @@ -7,10 +7,11 @@ @@ -22,9 +39,9 @@ index 0b94541..b58033c 100644 - "six==1.16.0", - "globus-sdk<4.0.0>=3.0.0", - "fair-research-login==0.2.6", -+ "six", ++ "fair-research-login>=0.2.6,<0.3.0", + "globus-sdk>=3.0.0,<4.0.0", -+ "fair-research-login", ++ "six", ], entry_points={"console_scripts": ["zstash=zstash.main:main"]}, - ) \ No newline at end of file + ) From db24387fe27c028f405d88c9be5a1eec7ee22265 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Thu, 2 Feb 2023 19:11:07 -0800 Subject: [PATCH 20/21] update zppy patch to reflect full PR --- recipes/zppy/patches/fix-setup-py.patch | 133 +++++++++++++++++++++++- 1 file changed, 131 insertions(+), 2 deletions(-) diff --git a/recipes/zppy/patches/fix-setup-py.patch b/recipes/zppy/patches/fix-setup-py.patch index 7519c76421a72..6521e57156a72 100644 --- a/recipes/zppy/patches/fix-setup-py.patch +++ b/recipes/zppy/patches/fix-setup-py.patch @@ -1,7 +1,7 @@ From 2a97a6c2763714655387188a2333c7fc8538052b Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Fri, 27 Jan 2023 14:17:16 -0700 -Subject: [PATCH] Make `setup.py` consistent with conda recipe +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. @@ -21,4 +21,133 @@ index bd283df..bb5feb9 100644 + 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"]}, \ No newline at end of file + entry_points={"console_scripts": ["zppy=zppy.__main__:main"]}, + +From b5ff07ae5d430a99676a9bc3c7cc7d164acf57d2 Mon Sep 17 00:00:00 2001 +From: Tom Vo +Date: Mon, 30 Jan 2023 12:22:44 -0800 +Subject: [PATCH 2/3] Update GH Actions actions versions + +--- + .github/workflows/build_workflow.yml | 14 +++++++------- + .github/workflows/release_workflow.yml | 10 +++++----- + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml +index 5814db3..76e6c48 100644 +--- a/.github/workflows/build_workflow.yml ++++ b/.github/workflows/build_workflow.yml +@@ -28,10 +28,10 @@ jobs: + timeout-minutes: 2 + steps: + - name: Checkout Code Repository +- uses: actions/checkout@v2 ++ uses: actions/checkout@v3 + + - name: Set up Python +- uses: actions/setup-python@v2 ++ uses: actions/setup-python@v4 + with: + python-version: 3.9 + +@@ -39,7 +39,7 @@ jobs: + # Getting only staged files can be tricky in case a new PR is opened + # since the action is run on a branch in detached head state + - name: Install and Run Pre-commit +- uses: pre-commit/action@v2.0.0 ++ uses: pre-commit/action@v3.0.0 + + build: + needs: check-jobs-to-skip +@@ -49,10 +49,10 @@ jobs: + run: + shell: bash -l {0} + steps: +- - uses: actions/checkout@v2 ++ - uses: actions/checkout@v3 + + - name: Cache Conda +- uses: actions/cache@v2 ++ uses: actions/cache@v3 + env: + CACHE_NUMBER: 0 + with: +@@ -99,12 +99,12 @@ jobs: + fetch-depth: 0 + + - name: Set up Python +- uses: actions/setup-python@v2 ++ uses: actions/setup-python@v4 + with: + python-version: 3.9 + + - name: Cache pip +- uses: actions/cache@v2 ++ uses: actions/cache@v3 + with: + # This path is specific to Ubuntu + path: ~/.cache/pip +diff --git a/.github/workflows/release_workflow.yml b/.github/workflows/release_workflow.yml +index 6c2f3c7..4c9c9ac 100644 +--- a/.github/workflows/release_workflow.yml ++++ b/.github/workflows/release_workflow.yml +@@ -12,10 +12,10 @@ jobs: + run: + shell: bash -l {0} + steps: +- - uses: actions/checkout@v2 ++ - uses: actions/checkout@v3 + + - name: Cache Conda +- uses: actions/cache@v2 ++ uses: actions/cache@v3 + env: + CACHE_NUMBER: 0 + with: +@@ -62,18 +62,18 @@ jobs: + shell: bash -l {0} + timeout-minutes: 5 + steps: +- - uses: actions/checkout@v2 ++ - uses: actions/checkout@v3 + with: + persist-credentials: false + fetch-depth: 0 + + - name: Set up Python +- uses: actions/setup-python@v2 ++ uses: actions/setup-python@v4 + with: + python-version: 3.9 + + - name: Cache pip +- uses: actions/cache@v2 ++ uses: actions/cache@v3 + with: + # This path is specific to Ubuntu + path: ~/.cache/pip + +From d8be84f045926a1ba3ab04c5ff4593dd05be535c Mon Sep 17 00:00:00 2001 +From: Tom Vo +Date: Mon, 30 Jan 2023 12:25:46 -0800 +Subject: [PATCH 3/3] Bump `isort` version to fix poetry error + +--- + .pre-commit-config.yaml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml +index efc3ea9..177692e 100644 +--- a/.pre-commit-config.yaml ++++ b/.pre-commit-config.yaml +@@ -18,8 +18,8 @@ repos: + - id: black + + # Can run individually with `pre-commit run isort --all-files` +- - repo: https://github.com/timothycrosley/isort +- rev: 5.10.1 ++ - repo: https://github.com/PyCQA/isort ++ rev: 5.12.0 + hooks: + - id: isort + From e1a0824bb52d8a3394567b6c5d5c18db059cd703 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Thu, 2 Feb 2023 19:13:48 -0800 Subject: [PATCH 21/21] trim zppy patch --- recipes/zppy/patches/fix-setup-py.patch | 129 ------------------------ 1 file changed, 129 deletions(-) diff --git a/recipes/zppy/patches/fix-setup-py.patch b/recipes/zppy/patches/fix-setup-py.patch index 6521e57156a72..2e2f1c847c737 100644 --- a/recipes/zppy/patches/fix-setup-py.patch +++ b/recipes/zppy/patches/fix-setup-py.patch @@ -22,132 +22,3 @@ index bd283df..bb5feb9 100644 packages=find_packages(include=["zppy", "zppy.*"]), package_data={"": data_files}, entry_points={"console_scripts": ["zppy=zppy.__main__:main"]}, - -From b5ff07ae5d430a99676a9bc3c7cc7d164acf57d2 Mon Sep 17 00:00:00 2001 -From: Tom Vo -Date: Mon, 30 Jan 2023 12:22:44 -0800 -Subject: [PATCH 2/3] Update GH Actions actions versions - ---- - .github/workflows/build_workflow.yml | 14 +++++++------- - .github/workflows/release_workflow.yml | 10 +++++----- - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml -index 5814db3..76e6c48 100644 ---- a/.github/workflows/build_workflow.yml -+++ b/.github/workflows/build_workflow.yml -@@ -28,10 +28,10 @@ jobs: - timeout-minutes: 2 - steps: - - name: Checkout Code Repository -- uses: actions/checkout@v2 -+ uses: actions/checkout@v3 - - - name: Set up Python -- uses: actions/setup-python@v2 -+ uses: actions/setup-python@v4 - with: - python-version: 3.9 - -@@ -39,7 +39,7 @@ jobs: - # Getting only staged files can be tricky in case a new PR is opened - # since the action is run on a branch in detached head state - - name: Install and Run Pre-commit -- uses: pre-commit/action@v2.0.0 -+ uses: pre-commit/action@v3.0.0 - - build: - needs: check-jobs-to-skip -@@ -49,10 +49,10 @@ jobs: - run: - shell: bash -l {0} - steps: -- - uses: actions/checkout@v2 -+ - uses: actions/checkout@v3 - - - name: Cache Conda -- uses: actions/cache@v2 -+ uses: actions/cache@v3 - env: - CACHE_NUMBER: 0 - with: -@@ -99,12 +99,12 @@ jobs: - fetch-depth: 0 - - - name: Set up Python -- uses: actions/setup-python@v2 -+ uses: actions/setup-python@v4 - with: - python-version: 3.9 - - - name: Cache pip -- uses: actions/cache@v2 -+ uses: actions/cache@v3 - with: - # This path is specific to Ubuntu - path: ~/.cache/pip -diff --git a/.github/workflows/release_workflow.yml b/.github/workflows/release_workflow.yml -index 6c2f3c7..4c9c9ac 100644 ---- a/.github/workflows/release_workflow.yml -+++ b/.github/workflows/release_workflow.yml -@@ -12,10 +12,10 @@ jobs: - run: - shell: bash -l {0} - steps: -- - uses: actions/checkout@v2 -+ - uses: actions/checkout@v3 - - - name: Cache Conda -- uses: actions/cache@v2 -+ uses: actions/cache@v3 - env: - CACHE_NUMBER: 0 - with: -@@ -62,18 +62,18 @@ jobs: - shell: bash -l {0} - timeout-minutes: 5 - steps: -- - uses: actions/checkout@v2 -+ - uses: actions/checkout@v3 - with: - persist-credentials: false - fetch-depth: 0 - - - name: Set up Python -- uses: actions/setup-python@v2 -+ uses: actions/setup-python@v4 - with: - python-version: 3.9 - - - name: Cache pip -- uses: actions/cache@v2 -+ uses: actions/cache@v3 - with: - # This path is specific to Ubuntu - path: ~/.cache/pip - -From d8be84f045926a1ba3ab04c5ff4593dd05be535c Mon Sep 17 00:00:00 2001 -From: Tom Vo -Date: Mon, 30 Jan 2023 12:25:46 -0800 -Subject: [PATCH 3/3] Bump `isort` version to fix poetry error - ---- - .pre-commit-config.yaml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml -index efc3ea9..177692e 100644 ---- a/.pre-commit-config.yaml -+++ b/.pre-commit-config.yaml -@@ -18,8 +18,8 @@ repos: - - id: black - - # Can run individually with `pre-commit run isort --all-files` -- - repo: https://github.com/timothycrosley/isort -- rev: 5.10.1 -+ - repo: https://github.com/PyCQA/isort -+ rev: 5.12.0 - hooks: - - id: isort -