From 740369a80e949c234be8e9d83c3489cb10b0c396 Mon Sep 17 00:00:00 2001 From: vhirtham <20574817+vhirtham@users.noreply.github.com> Date: Mon, 11 Jul 2022 12:20:01 +0200 Subject: [PATCH 01/13] increase python version --- devtools/conda.recipe/build_env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/conda.recipe/build_env.yml b/devtools/conda.recipe/build_env.yml index bb9511c5e..a0cb69761 100644 --- a/devtools/conda.recipe/build_env.yml +++ b/devtools/conda.recipe/build_env.yml @@ -3,7 +3,7 @@ channels: - conda-forge - defaults dependencies: - - python=3.8 + - python=3.9 - setuptools - setuptools_scm - conda-verify From a66ec6a0cecf312a1c20ae49b575931b33df58b4 Mon Sep 17 00:00:00 2001 From: vhirtham <20574817+vhirtham@users.noreply.github.com> Date: Mon, 11 Jul 2022 12:30:26 +0200 Subject: [PATCH 02/13] Add numpy to env --- devtools/conda.recipe/build_env.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/devtools/conda.recipe/build_env.yml b/devtools/conda.recipe/build_env.yml index a0cb69761..d3011bcfb 100644 --- a/devtools/conda.recipe/build_env.yml +++ b/devtools/conda.recipe/build_env.yml @@ -8,6 +8,7 @@ dependencies: - setuptools_scm - conda-verify - conda-build + - numpy - mamba - boa>=0.6 - anaconda-client From 0ed5f78529f5ac18c5d4abebc2b7561e6f5692a1 Mon Sep 17 00:00:00 2001 From: vhirtham <20574817+vhirtham@users.noreply.github.com> Date: Mon, 11 Jul 2022 13:40:09 +0200 Subject: [PATCH 03/13] Test pinning numpy --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index f78b61e56..7c62d8d71 100644 --- a/setup.cfg +++ b/setup.cfg @@ -37,7 +37,7 @@ setup_requires = setuptools >=38.3.0 setuptools_scm install_requires = - numpy >=1.20 + numpy ==1.21 asdf >=2.8.2 pandas >=1.0 xarray >=0.19 From 7db09519b5437a852d87c65989ccfecd06a13157 Mon Sep 17 00:00:00 2001 From: vhirtham <20574817+vhirtham@users.noreply.github.com> Date: Mon, 11 Jul 2022 14:12:36 +0200 Subject: [PATCH 04/13] set mamba version --- devtools/conda.recipe/build_env.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/devtools/conda.recipe/build_env.yml b/devtools/conda.recipe/build_env.yml index d3011bcfb..5a97e896d 100644 --- a/devtools/conda.recipe/build_env.yml +++ b/devtools/conda.recipe/build_env.yml @@ -3,13 +3,12 @@ channels: - conda-forge - defaults dependencies: - - python=3.9 + - python=3.8 - setuptools - setuptools_scm - conda-verify - conda-build - - numpy - - mamba + - mamba=0.23 - boa>=0.6 - anaconda-client - numpydoc>=0.5 From 4545c1f4e97792790ac1102d1bc8019507d3987a Mon Sep 17 00:00:00 2001 From: vhirtham <20574817+vhirtham@users.noreply.github.com> Date: Mon, 11 Jul 2022 15:41:06 +0200 Subject: [PATCH 05/13] pim --- devtools/conda.recipe/build_env.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devtools/conda.recipe/build_env.yml b/devtools/conda.recipe/build_env.yml index 5a97e896d..73ccb9157 100644 --- a/devtools/conda.recipe/build_env.yml +++ b/devtools/conda.recipe/build_env.yml @@ -8,7 +8,7 @@ dependencies: - setuptools_scm - conda-verify - conda-build - - mamba=0.23 - - boa>=0.6 + - mamba + - boa=0.10 - anaconda-client - numpydoc>=0.5 From 8e21fd9523f556fcfb5d1f7b23f9be497df8bb33 Mon Sep 17 00:00:00 2001 From: vhirtham <20574817+vhirtham@users.noreply.github.com> Date: Mon, 11 Jul 2022 15:46:32 +0200 Subject: [PATCH 06/13] pin setuptools --- devtools/conda.recipe/build_env.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devtools/conda.recipe/build_env.yml b/devtools/conda.recipe/build_env.yml index 73ccb9157..e9f256136 100644 --- a/devtools/conda.recipe/build_env.yml +++ b/devtools/conda.recipe/build_env.yml @@ -4,11 +4,11 @@ channels: - defaults dependencies: - python=3.8 - - setuptools - - setuptools_scm + - setuptools=62.6.0 + - setuptools_scm=7.0.2 - conda-verify - conda-build - mamba - - boa=0.10 + - boa>=0.6 - anaconda-client - numpydoc>=0.5 From 558b60291c3266d768e07d975b77e7673e458eae Mon Sep 17 00:00:00 2001 From: vhirtham <20574817+vhirtham@users.noreply.github.com> Date: Mon, 11 Jul 2022 15:51:11 +0200 Subject: [PATCH 07/13] pin everything --- devtools/conda.recipe/build_env.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/devtools/conda.recipe/build_env.yml b/devtools/conda.recipe/build_env.yml index e9f256136..33fed1114 100644 --- a/devtools/conda.recipe/build_env.yml +++ b/devtools/conda.recipe/build_env.yml @@ -6,9 +6,9 @@ dependencies: - python=3.8 - setuptools=62.6.0 - setuptools_scm=7.0.2 - - conda-verify - - conda-build - - mamba - - boa>=0.6 - - anaconda-client - - numpydoc>=0.5 + - conda-verify=3.1.1 + - conda-build=3.21.9 + - mamba=0.24.0 + - boa=0.11.0 + - anaconda-client=1.8.0 + - numpydoc=1.4.0 From 5e6b0fcc019c6e06b16b75cf383391df19aeb3c9 Mon Sep 17 00:00:00 2001 From: vhirtham <20574817+vhirtham@users.noreply.github.com> Date: Mon, 11 Jul 2022 16:03:54 +0200 Subject: [PATCH 08/13] pin urllib --- devtools/conda.recipe/build_env.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/devtools/conda.recipe/build_env.yml b/devtools/conda.recipe/build_env.yml index 33fed1114..9ffca0f4d 100644 --- a/devtools/conda.recipe/build_env.yml +++ b/devtools/conda.recipe/build_env.yml @@ -12,3 +12,4 @@ dependencies: - boa=0.11.0 - anaconda-client=1.8.0 - numpydoc=1.4.0 + - urllib=1.26.9 From 97742dc5c2b7894080f2754f2cc52675c47b937a Mon Sep 17 00:00:00 2001 From: vhirtham <20574817+vhirtham@users.noreply.github.com> Date: Mon, 11 Jul 2022 16:11:23 +0200 Subject: [PATCH 09/13] pin urllib --- devtools/conda.recipe/build_env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/conda.recipe/build_env.yml b/devtools/conda.recipe/build_env.yml index 9ffca0f4d..54b00419b 100644 --- a/devtools/conda.recipe/build_env.yml +++ b/devtools/conda.recipe/build_env.yml @@ -12,4 +12,4 @@ dependencies: - boa=0.11.0 - anaconda-client=1.8.0 - numpydoc=1.4.0 - - urllib=1.26.9 + - urllib3=1.26.9 From d638af021622e43379d3f07cd13c284631a87a2e Mon Sep 17 00:00:00 2001 From: vhirtham <20574817+vhirtham@users.noreply.github.com> Date: Mon, 11 Jul 2022 16:16:10 +0200 Subject: [PATCH 10/13] Update setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 7c62d8d71..5b5d026a2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -37,7 +37,7 @@ setup_requires = setuptools >=38.3.0 setuptools_scm install_requires = - numpy ==1.21 +numpy >=1.20 asdf >=2.8.2 pandas >=1.0 xarray >=0.19 From cf52d79964f1532c1c7fe6ed245c10ccb13926e2 Mon Sep 17 00:00:00 2001 From: vhirtham <20574817+vhirtham@users.noreply.github.com> Date: Mon, 11 Jul 2022 16:23:43 +0200 Subject: [PATCH 11/13] Update setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 5b5d026a2..f78b61e56 100644 --- a/setup.cfg +++ b/setup.cfg @@ -37,7 +37,7 @@ setup_requires = setuptools >=38.3.0 setuptools_scm install_requires = -numpy >=1.20 + numpy >=1.20 asdf >=2.8.2 pandas >=1.0 xarray >=0.19 From 532c59c31c1cc621ec45a78b099954cc2ba770bf Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Wed, 13 Jul 2022 16:14:07 +0200 Subject: [PATCH 12/13] add channel to mambabuild --- .github/workflows/build_pkg.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_pkg.yml b/.github/workflows/build_pkg.yml index 7b5dc1b85..0106be452 100644 --- a/.github/workflows/build_pkg.yml +++ b/.github/workflows/build_pkg.yml @@ -51,9 +51,12 @@ jobs: - name: conda list run: conda list + + - name: conda config + run: conda config --show - name: Build from local conda recipe - run: conda mambabuild . + run: conda mambabuild -c conda-forge . pypi: if: | From 41d990757dd52fe30a0c76ab087f944ca247d42c Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Wed, 13 Jul 2022 16:31:39 +0200 Subject: [PATCH 13/13] unpin --- .github/workflows/build_pkg.yml | 3 --- devtools/conda.recipe/build_env.yml | 17 ++++++++--------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_pkg.yml b/.github/workflows/build_pkg.yml index 0106be452..38a8c610a 100644 --- a/.github/workflows/build_pkg.yml +++ b/.github/workflows/build_pkg.yml @@ -51,9 +51,6 @@ jobs: - name: conda list run: conda list - - - name: conda config - run: conda config --show - name: Build from local conda recipe run: conda mambabuild -c conda-forge . diff --git a/devtools/conda.recipe/build_env.yml b/devtools/conda.recipe/build_env.yml index 54b00419b..bb9511c5e 100644 --- a/devtools/conda.recipe/build_env.yml +++ b/devtools/conda.recipe/build_env.yml @@ -4,12 +4,11 @@ channels: - defaults dependencies: - python=3.8 - - setuptools=62.6.0 - - setuptools_scm=7.0.2 - - conda-verify=3.1.1 - - conda-build=3.21.9 - - mamba=0.24.0 - - boa=0.11.0 - - anaconda-client=1.8.0 - - numpydoc=1.4.0 - - urllib3=1.26.9 + - setuptools + - setuptools_scm + - conda-verify + - conda-build + - mamba + - boa>=0.6 + - anaconda-client + - numpydoc>=0.5