From da2c46a46cee26641d53734f93f84375265d9cc1 Mon Sep 17 00:00:00 2001 From: Liz Gehret Date: Thu, 22 Aug 2024 11:19:45 -0700 Subject: [PATCH 01/10] revert jinja call for pulling dynamic version --- ci/recipe/meta.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml index 74a6326..f78c7d9 100644 --- a/ci/recipe/meta.yaml +++ b/ci/recipe/meta.yaml @@ -1,5 +1,5 @@ -{% set pkg_data = load_file_data('../../../../report.json') %} -{% set version = pkg_data['install'][0]['metadata']['version'] %} +{% set data = load_setup_py_data() %} +{% set version = data.get('version') or 'placehold' %} package: name: q2-vizard @@ -22,6 +22,8 @@ requirements: - python {{ python }} - pip - setuptools + # now that we're not vendoring versioneer, we need to add it into the host + # reqs in order for it to get added to the conda env for build pkg step - versioneer run: From 44d36245ff29492ab3f0eb583128da7bb95fe83d Mon Sep 17 00:00:00 2001 From: Liz Gehret Date: Thu, 22 Aug 2024 11:26:28 -0700 Subject: [PATCH 02/10] let's try adding versioneer back into build deps --- ci/recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml index f78c7d9..85ff2aa 100644 --- a/ci/recipe/meta.yaml +++ b/ci/recipe/meta.yaml @@ -17,6 +17,7 @@ requirements: # in order to render out transpiled js assets for various visualizations. # once rendered, node is no longer necessary. don't set this in host reqs. - nodejs + - versioneer host: - python {{ python }} @@ -24,7 +25,7 @@ requirements: - setuptools # now that we're not vendoring versioneer, we need to add it into the host # reqs in order for it to get added to the conda env for build pkg step - - versioneer + # - versioneer run: - python {{ python }} From d5594a595ec90eac1a625881d8174475546127f7 Mon Sep 17 00:00:00 2001 From: Liz Gehret Date: Thu, 22 Aug 2024 14:25:36 -0700 Subject: [PATCH 03/10] use environment variable for version --- ci/recipe/meta.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml index 85ff2aa..86bec58 100644 --- a/ci/recipe/meta.yaml +++ b/ci/recipe/meta.yaml @@ -1,9 +1,6 @@ -{% set data = load_setup_py_data() %} -{% set version = data.get('version') or 'placehold' %} - package: name: q2-vizard - version: {{ version }} + version: {{ environ.get('PKG_VERSION') }} source: path: ../.. @@ -17,7 +14,6 @@ requirements: # in order to render out transpiled js assets for various visualizations. # once rendered, node is no longer necessary. don't set this in host reqs. - nodejs - - versioneer host: - python {{ python }} @@ -25,7 +21,7 @@ requirements: - setuptools # now that we're not vendoring versioneer, we need to add it into the host # reqs in order for it to get added to the conda env for build pkg step - # - versioneer + - versioneer run: - python {{ python }} From eaf80baf5c6202d7dba0276e89fd7cdd239f4aa1 Mon Sep 17 00:00:00 2001 From: Liz Gehret Date: Thu, 22 Aug 2024 15:03:00 -0700 Subject: [PATCH 04/10] let's see where this is falling over --- ci/recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml index 86bec58..7c7e2db 100644 --- a/ci/recipe/meta.yaml +++ b/ci/recipe/meta.yaml @@ -6,7 +6,9 @@ source: path: ../.. build: - script: {{ PYTHON }} -m pip install -v . + script: | + echo "pkg version: {{ environ.get('PKG_VERSION') }}" + {{ PYTHON }} -m pip install -v . requirements: build: From bfe5eeb994e5212ec2a24ef253a41ba2a481a29a Mon Sep 17 00:00:00 2001 From: Liz Gehret Date: Thu, 22 Aug 2024 16:17:17 -0700 Subject: [PATCH 05/10] let's see what the state of the env is now --- ci/recipe/meta.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml index 7c7e2db..cb4fe84 100644 --- a/ci/recipe/meta.yaml +++ b/ci/recipe/meta.yaml @@ -7,7 +7,10 @@ source: build: script: | - echo "pkg version: {{ environ.get('PKG_VERSION') }}" + echo "ENVIRONMENT VARIABLES:" + {% for key, value in environ.items() %} + echo "{{ key }} = {{ value }}" + {% endfor %} {{ PYTHON }} -m pip install -v . requirements: From e09ca64ffc120b2a19fde3a4035586d319f4f6ff Mon Sep 17 00:00:00 2001 From: Liz Gehret Date: Thu, 22 Aug 2024 16:19:26 -0700 Subject: [PATCH 06/10] more info --- ci/recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml index cb4fe84..f496a86 100644 --- a/ci/recipe/meta.yaml +++ b/ci/recipe/meta.yaml @@ -7,7 +7,7 @@ source: build: script: | - echo "ENVIRONMENT VARIABLES:" + echo "ENVIRONMENT VARIABLES DURING CONDA BUILD" {% for key, value in environ.items() %} echo "{{ key }} = {{ value }}" {% endfor %} From 4ae63328c3ddb02da08fe25286f27f2aaaeae59c Mon Sep 17 00:00:00 2001 From: Liz Gehret Date: Thu, 22 Aug 2024 16:39:13 -0700 Subject: [PATCH 07/10] here's to hoping... --- ci/recipe/meta.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml index f496a86..ba0656c 100644 --- a/ci/recipe/meta.yaml +++ b/ci/recipe/meta.yaml @@ -1,17 +1,14 @@ package: name: q2-vizard - version: {{ environ.get('PKG_VERSION') }} + version: {{ PKG_VERSION }} source: path: ../.. build: - script: | - echo "ENVIRONMENT VARIABLES DURING CONDA BUILD" - {% for key, value in environ.items() %} - echo "{{ key }} = {{ value }}" - {% endfor %} - {{ PYTHON }} -m pip install -v . + script-env: + - PKG_VERSION + script: {{ PYTHON }} -m pip install -v . requirements: build: From 5fb711c75254db85ee614fc0e69242e2fddcbd0b Mon Sep 17 00:00:00 2001 From: Liz Gehret Date: Thu, 22 Aug 2024 16:47:08 -0700 Subject: [PATCH 08/10] this probably won't work --- ci/recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml index ba0656c..528b314 100644 --- a/ci/recipe/meta.yaml +++ b/ci/recipe/meta.yaml @@ -7,7 +7,7 @@ source: build: script-env: - - PKG_VERSION + - PKG_VERSION={{ environ.get('PKG_VERSION') }} script: {{ PYTHON }} -m pip install -v . requirements: From b377601a6cac4a11412b44d090e37f277222121a Mon Sep 17 00:00:00 2001 From: Liz Gehret Date: Thu, 22 Aug 2024 16:59:40 -0700 Subject: [PATCH 09/10] let's just prove this isn't working --- ci/recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml index 528b314..48a0f83 100644 --- a/ci/recipe/meta.yaml +++ b/ci/recipe/meta.yaml @@ -7,7 +7,7 @@ source: build: script-env: - - PKG_VERSION={{ environ.get('PKG_VERSION') }} + - PKG_VERSION={{ environ.get('PKG_VERSION', '0.0.0') }} script: {{ PYTHON }} -m pip install -v . requirements: From 2f41e598124f621226a137898a98a5f57dbbe036 Mon Sep 17 00:00:00 2001 From: Liz Gehret Date: Thu, 22 Aug 2024 17:09:47 -0700 Subject: [PATCH 10/10] try again with a non-shadowed conda var name --- ci/recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml index 48a0f83..36f45c2 100644 --- a/ci/recipe/meta.yaml +++ b/ci/recipe/meta.yaml @@ -1,13 +1,13 @@ package: name: q2-vizard - version: {{ PKG_VERSION }} + version: {{ PLUGIN_VERSION }} source: path: ../.. build: script-env: - - PKG_VERSION={{ environ.get('PKG_VERSION', '0.0.0') }} + - PLUGIN_VERSION script: {{ PYTHON }} -m pip install -v . requirements: