Merge pull request #10 from olemke/main

Build 3.0.0dev4 snapshot
atmtools · Nov 25, 2024 · 07028e9 · 07028e9
2 parents b7d358c + 604ab28
commit 07028e9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git 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
@@ -1,4 +1,6 @@
 name: pyarts-build
+channels:
+  - conda-forge
 dependencies:
   - boa
   - anaconda-client
diff --git 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]

diff --git a/pyarts/meta.yaml b/pyarts/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "pyarts" %}
-{% set version = "3.0.0dev2" %}
+{% set version = "3.0.0dev4" %}
 {% set dev_url = "https://github.com/atmtools/arts" %}
 
 package:
@@ -8,9 +8,10 @@ package:
 
 source:
   url: {{ dev_url }}/archive/refs/tags/v{{ version }}.tar.gz
-  sha256: 225986f69c1e04ffd79f8b5d5920520b24cb13a2eec477b28059f55445c6e79a
+  sha256: e43db3520a54cf33ea547498f1861107fd4de140c41e0b17d96214383f65ca3a
   # git_url: {{ dev_url }}.git
-  git_depth: 1
+  # git_rev: bump-version
+  # git_depth: 1
 
 build:
   number: 0
@@ -47,9 +48,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 +68,7 @@ requirements:
     - scipy
     - tqdm
     - typing_extensions
-    - xarray
+    - xarray>=2024
     - zlib