Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add zppy + zstash to conda-forge #21883

Merged
merged 24 commits into from
Feb 8, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions recipes/zppy/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{% 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
mahf708 marked this conversation as resolved.
Show resolved Hide resolved
- 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
# 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
summary: 'E3SM post-processing toolchain'
license: BSD-3-Clause AND custom
license_file:
- LICENSE
- NOTICE

extra:
recipe-maintainers:
- mahf708
- xylar
- tomvothecoder
- forsyth2
- chengzhuzhang
24 changes: 24 additions & 0 deletions recipes/zppy/patches/fix-setup-py.patch
Original file line number Diff line number Diff line change
@@ -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] 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"]},
57 changes: 57 additions & 0 deletions recipes/zstash/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{% 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 >=2
mahf708 marked this conversation as resolved.
Show resolved Hide resolved
- fair-research-login
mahf708 marked this conversation as resolved.
Show resolved Hide resolved

test:
imports:
- zstash
commands:
- zstash --help
# will reenable after E3SM-Project/zstash#250
- pip check
- ${PYTHON} -m unittest tests/test_*.py
mahf708 marked this conversation as resolved.
Show resolved Hide resolved
source_files:
- tests
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
30 changes: 30 additions & 0 deletions recipes/zstash/patches/fix-setup-py.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From bcdf84b4889777daf9ebb73a7d7e25c974f210e8 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 `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="[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",
+ "six",
+ "globus-sdk>=2.0.0",
mahf708 marked this conversation as resolved.
Show resolved Hide resolved
+ "fair-research-login",
],
entry_points={"console_scripts": ["zstash=zstash.main:main"]},
)