Skip to content

Commit cd46448

Browse files
authored
Merge pull request #16 from forsyth2/v1.5.0rc1
v1.5.0rc1
2 parents f59150f + 50e60c6 commit cd46448

File tree

8 files changed

+50
-35
lines changed

8 files changed

+50
-35
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 zstash_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: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{% set name = "zstash" %}
2-
{% set version = "1.4.4rc2" %}
2+
{% set version = "1.5.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/zstash/archive/v{{ version }}.tar.gz
10-
sha256: d0592e9036d1240aa069b9a4ddd4a7c1846b6a2ec3d2935b383e1bedbff239e8
11+
sha256: 0deda016d8ba4fb5f4051d3a01516a3d38cc28dc7beb09ac54515955313d96e7
1112

1213
build:
1314
number: 0
@@ -22,9 +23,9 @@ requirements:
2223

2324
run:
2425
- python >={{ python_min }}
25-
- fair-research-login >=0.2.6,<0.3.0
26-
- globus-sdk >=3.0.0,<4.0.0
27-
- six
26+
- sqlite
27+
- six >=1.16.0
28+
- globus-sdk >=3.15.0
2829

2930
test:
3031
imports:

0 commit comments

Comments
 (0)