Skip to content

Commit 11c0546

Browse files
authored
Merge pull request #27 from forsyth2/v3.1.0rc1
V3.1.0rc1
2 parents de740f2 + ef81563 commit 11c0546

File tree

8 files changed

+52
-36
lines changed

8 files changed

+52
-36
lines changed

.azure-pipelines/azure-pipelines-linux.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.ci_support/linux_64_.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
cdt_name:
2-
- conda
31
channel_sources:
42
- conda-forge
53
channel_targets:
64
- conda-forge zppy_dev
75
docker_image:
86
- quay.io/condaforge/linux-anvil-x86_64:alma9
97
python_min:
10-
- '3.9'
8+
- '3.10'

.gitattributes

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.scripts/build_steps.sh

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.scripts/run_docker_build.sh

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build-locally.py

Lines changed: 35 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

recipe/meta.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{% set name = "zppy" %}
2-
{% set version = "3.0.0rc5" %}
2+
{% set version = "3.1.0rc1" %}
3+
{% set python_min = "3.11" %}
34

45
package:
56
name: {{ name|lower }}
67
version: {{ version }}
78

89
source:
910
url: https://github.com/E3SM-Project/zppy/archive/v{{ version }}.tar.gz
10-
sha256: 48bae2d2722b8d60cfcf2b74abc712dc4451e05ba8887d2d1811855ea8ab6618
11+
sha256: 0229a20ab20ac0545486140d61e870301e0ebf68a2ca08edf061daff52ec0bd4
1112

1213
build:
1314
number: 0
@@ -22,11 +23,12 @@ requirements:
2223
- pip
2324
- setuptools
2425
run:
25-
- python >={{ python_min }}
26-
- configobj >=5.0.0,<6.0.0
27-
- jinja2 >=2.0.0
28-
- mache >=1.3.2
26+
- python >={{ python_min }},<3.14
27+
- configobj >=5.0.6
28+
- jinja2 >=3.1.2
29+
- mache >=1.5.0
2930
- mpas_tools >=0.15.0
31+
- pillow >=9.2.0
3032

3133
test:
3234
requires:

0 commit comments

Comments
 (0)