Pin r-base to >3.5 to avoid unsolveable env on osx-arm64

Add additional build requirements for metadata Add scikit-build-core to host requirements Remove use-only-tar-bz2 setting to true in build job as scikit-build-core can only be installed from defaults as tar.bz2
cropsinsilico · Feb 5, 2024 · 39cc27b · 39cc27b
1 parent e196fb3
commit 39cc27b
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 11 deletions.
diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml
@@ -368,7 +368,6 @@ jobs:
         miniforge-variant: Mambaforge
         python-version: ${{ matrix.python-version }}
         use-mamba: true
-        use-only-tar-bz2: true
     - if: (matrix.install-method == 'conda' || matrix.install-method == 'mamba') &&
         runner.os == 'Windows' && env.INSTALLC == 1
       name: (WINDOWS,CONDA) Set up MSVC Compiler
@@ -721,7 +720,6 @@ jobs:
         miniforge-variant: Mambaforge
         python-version: ${{ matrix.python-version }}
         use-mamba: true
-        use-only-tar-bz2: true
     - if: (matrix.install-method == 'conda' || matrix.install-method == 'mamba') &&
         runner.os == 'Windows' && env.INSTALLC == 1
       name: (WINDOWS,CONDA) Set up MSVC Compiler
@@ -1058,7 +1056,6 @@ jobs:
         miniforge-variant: Mambaforge
         python-version: ${{ matrix.python-version }}
         use-mamba: true
-        use-only-tar-bz2: true
     - if: (matrix.install-method == 'conda' || matrix.install-method == 'mamba') &&
         runner.os == 'Windows' && env.INSTALLC == 1
       name: (WINDOWS,CONDA) Set up MSVC Compiler
@@ -1378,7 +1375,6 @@ jobs:
         miniforge-variant: Mambaforge
         python-version: ${{ matrix.python-version }}
         use-mamba: true
-        use-only-tar-bz2: true
     - if: (matrix.install-method == 'conda' || matrix.install-method == 'mamba') &&
         runner.os == 'Windows' && env.INSTALLC == 1
       name: (WINDOWS,CONDA) Set up MSVC Compiler
@@ -1697,7 +1693,6 @@ jobs:
         miniforge-variant: Mambaforge
         python-version: ${{ matrix.python-version }}
         use-mamba: true
-        use-only-tar-bz2: true
     - if: (matrix.install-method == 'conda' || matrix.install-method == 'mamba') &&
         runner.os == 'Windows' && env.INSTALLC == 1
       name: (WINDOWS,CONDA) Set up MSVC Compiler

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -15,7 +15,7 @@ build:
   string: py{{ PY_VER_MAJOR }}{{ PY_VER_MINOR }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
   run_exports:
     - {{ pin_subpackage('yggdrasil', max_pin='x.x.x') }}
-  script: '{{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv '
+  script: '{{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv --no-build-isolation'
   skip: true  # [(win and vc<14) or py<35]
   entry_points:
     - yggdrasil = yggdrasil.command_line:main
@@ -47,15 +47,20 @@ requirements:
   build:
     - build
     - cross-python_{{ target_platform }}     # [build_platform != target_platform]
+    - hatch-fancy-pypi-readme
     - numpy >=1.13.0
     - python                                 # [build_platform != target_platform]
     - scikit-build-core
+    - setuptools_scm
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
   host:
+    - hatch-fancy-pypi-readme
     - numpy >=1.13.0
     - pip
     - python
+    - scikit-build-core
+    - setuptools_scm
     - sysv_ipc  # [not win]
   run:
     - GitPython
@@ -122,7 +127,7 @@ outputs:
     requirements:
       host:
         - python
-        - r-base
+        - r-base >3.5
         - r-bit64
         - r-devtools  # [not win]
         - r-r6
@@ -131,7 +136,7 @@ outputs:
         - r-zeallot
       run:
         - {{ pin_subpackage('yggdrasil', exact=True) }}
-        - r-base
+        - r-base >3.5
         - r-bit64
         - r-devtools  # [not win]
         - r-r6

diff --git a/utils/requirements/requirements.json b/utils/requirements/requirements.json
@@ -94,8 +94,18 @@
     "pyyaml",
     "pyzmq",
     "requests",
+    {
+      "hatch-fancy-pypi-readme": {
+        "host": true,
+        "flags": {
+          "build": true,
+          "build_only": true
+        }
+      }
+    },
     {
       "scikit-build-core": {
+        "host": true,
         "flags": {
           "build": true,
           "build_only": true
@@ -109,6 +119,15 @@
         }
       }
     },
+    {
+      "setuptools_scm": {
+        "host": true,
+        "flags": {
+          "build": true,
+          "build_only": true
+        }
+      }
+    },
     "six",
     "toml",
     "unyt",
@@ -218,6 +237,7 @@
             "executable": "R",
             "options": [
               {
+                "name": "r-base>3.5",
                 "method": "conda",
                 "host": true
               },

diff --git a/utils/requirements/requirements.yaml b/utils/requirements/requirements.yaml
@@ -24,6 +24,11 @@ general:
   - flask
   - git:
       method: conda
+  - hatch-fancy-pypi-readme:
+      host: True
+      flags:
+        build: True
+        build_only: True
   - matplotlib:
       flags:
         from_env: MATPLOTLIB
@@ -55,12 +60,18 @@ general:
   - pyzmq
   - requests
   - scikit-build-core:
+      host: True
       flags:
         build: True
         build_only: True
   - scipy:
       flags:
         method_in_setup: conda
+  - setuptools_scm:
+      host: True
+      flags:
+        build: True
+        build_only: True
   - six
   - toml
   - unyt
@@ -135,7 +146,8 @@ extras:
     - r-base:
         executable: R
         options:
-        - method: conda
+        - name: r-base>3.5
+          method: conda
           host: True
         - method: apt
           add: [r-base-dev]

diff --git a/utils/requirements/requirements_condaonly.txt b/utils/requirements/requirements_condaonly.txt
@@ -13,7 +13,7 @@ matplotlib-base  # [conda]
 mpich; platform_system == 'Linux'  # [conda,mpi]
 msmpi; platform_system == 'Windows'  # [conda,mpi]
 openmpi; platform_system == 'Darwin'  # [conda,mpi]
-r-base           # [conda,r]
+r-base>3.5       # [conda,r]
 r-bit64          # [conda,r]
 r-devtools; platform_system != 'Windows'  # [conda,r]
 r-r6             # [conda,r]

diff --git a/utils/test-install-base.yml b/utils/test-install-base.yml
@@ -203,7 +203,7 @@ jobs:
         auto-update-conda: true
         python-version: ${{ matrix.python-version }}
         channels: conda-forge
-        use-only-tar-bz2: true
+        # use-only-tar-bz2: true
         channel-priority: strict
         miniforge-variant: Mambaforge
         use-mamba: true