From 8275979837029e7c9cded1c8abba1828a58881f7 Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Tue, 18 Jan 2022 10:11:59 -0800 Subject: [PATCH 1/2] Fix conda requirements --- conda/dev.yml | 3 +++ conda/meta.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/conda/dev.yml b/conda/dev.yml index 0ee2ca7c..9dbd95e6 100644 --- a/conda/dev.yml +++ b/conda/dev.yml @@ -7,6 +7,9 @@ dependencies: # ================= - pip=21.0.1 - python=3.7.10 + - six==1.16.0 + - globus-sdk==2.0.1 + - fair-research-login==0.2.0 # Developer Tools # ================= # If versions are updated, also update 'rev' in `.pre-commit.config.yaml` diff --git a/conda/meta.yaml b/conda/meta.yaml index e8290123..c32962cd 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -21,6 +21,9 @@ requirements: run: - python >=3.6 + - six==1.16.0 + - globus-sdk==2.0.1 + - fair-research-login==0.2.0 test: imports: From e9ce27000ed3858e605a8f966f4f42c4469b4b6c Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Tue, 18 Jan 2022 10:40:48 -0800 Subject: [PATCH 2/2] Address comments --- conda/dev.yml | 6 +++--- conda/meta.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conda/dev.yml b/conda/dev.yml index 9dbd95e6..a5e74ec0 100644 --- a/conda/dev.yml +++ b/conda/dev.yml @@ -7,9 +7,9 @@ dependencies: # ================= - pip=21.0.1 - python=3.7.10 - - six==1.16.0 - - globus-sdk==2.0.1 - - fair-research-login==0.2.0 + - six=1.16.0 + - globus-sdk=2.0.1 + - fair-research-login=0.2.0 # Developer Tools # ================= # If versions are updated, also update 'rev' in `.pre-commit.config.yaml` diff --git a/conda/meta.yaml b/conda/meta.yaml index c32962cd..84007079 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -21,9 +21,9 @@ requirements: run: - python >=3.6 - - six==1.16.0 - - globus-sdk==2.0.1 - - fair-research-login==0.2.0 + - six + - globus-sdk + - fair-research-login test: imports: