From 2ec1c37057344ff10decbc083c7bf7ecb0f48f28 Mon Sep 17 00:00:00 2001 From: Oliver Lemke Date: Mon, 11 Nov 2024 08:55:51 +0100 Subject: [PATCH 1/6] Build current --- pyarts/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyarts/meta.yaml b/pyarts/meta.yaml index 332bdea..ea45508 100644 --- a/pyarts/meta.yaml +++ b/pyarts/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pyarts" %} -{% set version = "3.0.0dev2" %} +{% set version = "3.0.0dev3" %} {% set dev_url = "https://github.com/atmtools/arts" %} package: @@ -7,9 +7,9 @@ package: version: {{ version }} source: - url: {{ dev_url }}/archive/refs/tags/v{{ version }}.tar.gz - sha256: 225986f69c1e04ffd79f8b5d5920520b24cb13a2eec477b28059f55445c6e79a - # git_url: {{ dev_url }}.git + # url: {{ dev_url }}/archive/refs/tags/v{{ version }}.tar.gz + # sha256: 225986f69c1e04ffd79f8b5d5920520b24cb13a2eec477b28059f55445c6e79a + git_url: {{ dev_url }}.git git_depth: 1 build: From eace51005ec05befdcbb3f2cdfb658f381883ead Mon Sep 17 00:00:00 2001 From: Oliver Lemke Date: Tue, 19 Nov 2024 09:47:40 +0100 Subject: [PATCH 2/6] Ensure no default channel is not used --- .github/workflows/conda-build.yml | 2 ++ etc/environment-pyarts-build.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index db4a462..e8ab55a 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -16,6 +16,8 @@ jobs: - uses: conda-incubator/setup-miniconda@v3 with: miniforge-version: latest + channels: conda-forge + conda-remove-defaults: "true" activate-environment: pyarts-build environment-file: etc/environment-pyarts-build.yml - shell: bash -l {0} diff --git a/etc/environment-pyarts-build.yml b/etc/environment-pyarts-build.yml index 19fe742..c867fb4 100644 --- a/etc/environment-pyarts-build.yml +++ b/etc/environment-pyarts-build.yml @@ -1,4 +1,6 @@ name: pyarts-build +channels: + - conda-forge dependencies: - boa - anaconda-client From 59dff6a75a28fca52eff3d9eff4d13cf641ea7f9 Mon Sep 17 00:00:00 2001 From: Oliver Lemke Date: Wed, 20 Nov 2024 11:31:58 +0100 Subject: [PATCH 3/6] Add setuptools, require xarray>=2024 In some configurations, conda installed an old xarray package. --- pyarts/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyarts/meta.yaml b/pyarts/meta.yaml index ea45508..59c4326 100644 --- a/pyarts/meta.yaml +++ b/pyarts/meta.yaml @@ -47,9 +47,10 @@ requirements: - python-build - requests - scipy + - setuptools - tqdm - typing_extensions - - xarray + - xarray>=2024 - zlib run: - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.15") }} # [osx and x86_64] @@ -66,7 +67,7 @@ requirements: - scipy - tqdm - typing_extensions - - xarray + - xarray>=2024 - zlib From 7b3d26d3126f0da4037f39773e53b410c3288d86 Mon Sep 17 00:00:00 2001 From: Oliver Lemke Date: Wed, 20 Nov 2024 12:07:52 +0100 Subject: [PATCH 4/6] Use clang 19 on osx --- pyarts/conda_build_config.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyarts/conda_build_config.yaml b/pyarts/conda_build_config.yaml index f504d8f..486d8db 100644 --- a/pyarts/conda_build_config.yaml +++ b/pyarts/conda_build_config.yaml @@ -6,6 +6,10 @@ c_compiler: # [win] - vs2022 # [win] target_platform: # [win] - win-64 # [win] +c_compiler_version: # [osx] + - 19 # [osx] +cxx_compiler_version: # [osx] + - 19 # [osx] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - "13.5" # [osx and x86_64] MACOSX_SDK_VERSION: # [osx and x86_64] From 8bbcaf1656746dd05cb03ba51f17fa2d2c518fcc Mon Sep 17 00:00:00 2001 From: Oliver Lemke Date: Mon, 25 Nov 2024 08:15:13 +0100 Subject: [PATCH 5/6] Build dev version --- pyarts/meta.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pyarts/meta.yaml b/pyarts/meta.yaml index 59c4326..0b9ebf4 100644 --- a/pyarts/meta.yaml +++ b/pyarts/meta.yaml @@ -1,6 +1,6 @@ {% set name = "pyarts" %} -{% set version = "3.0.0dev3" %} -{% set dev_url = "https://github.com/atmtools/arts" %} +{% set version = "3.0.0dev4" %} +{% set dev_url = "https://github.com/olemke/arts" %} package: name: {{ name|lower }} @@ -10,7 +10,8 @@ source: # url: {{ dev_url }}/archive/refs/tags/v{{ version }}.tar.gz # sha256: 225986f69c1e04ffd79f8b5d5920520b24cb13a2eec477b28059f55445c6e79a git_url: {{ dev_url }}.git - git_depth: 1 + git_rev: bump-version + # git_depth: 1 build: number: 0 From 604ab28696ec0cff21a9eb56e8a1b23f591f87bc Mon Sep 17 00:00:00 2001 From: Oliver Lemke Date: Mon, 25 Nov 2024 10:46:04 +0100 Subject: [PATCH 6/6] Switch to snapshot 3.0.0dev4 --- pyarts/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pyarts/meta.yaml b/pyarts/meta.yaml index 0b9ebf4..abd72fa 100644 --- a/pyarts/meta.yaml +++ b/pyarts/meta.yaml @@ -1,16 +1,16 @@ {% set name = "pyarts" %} {% set version = "3.0.0dev4" %} -{% set dev_url = "https://github.com/olemke/arts" %} +{% set dev_url = "https://github.com/atmtools/arts" %} package: name: {{ name|lower }} version: {{ version }} source: - # url: {{ dev_url }}/archive/refs/tags/v{{ version }}.tar.gz - # sha256: 225986f69c1e04ffd79f8b5d5920520b24cb13a2eec477b28059f55445c6e79a - git_url: {{ dev_url }}.git - git_rev: bump-version + url: {{ dev_url }}/archive/refs/tags/v{{ version }}.tar.gz + sha256: e43db3520a54cf33ea547498f1861107fd4de140c41e0b17d96214383f65ca3a + # git_url: {{ dev_url }}.git + # git_rev: bump-version # git_depth: 1 build: