Merge branch 'master' into stdlib

regro · Mar 25, 2024 · 47c2ea1 · 47c2ea1
2 parents 65afee3 + 1d8f232
commit 47c2ea1
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 49 deletions.
diff --git a/.github/workflows/bot-cache.yml b/.github/workflows/bot-cache.yml
@@ -22,7 +22,7 @@ jobs:
     steps:
       - name: run cache
         if: success() && ! env.CI_SKIP
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: cf-graph.tar.zstd
           key: cf-graph-tzstd-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.version }}

diff --git a/conda-lock.yml b/conda-lock.yml
@@ -1946,39 +1946,39 @@ package:
   - category: main
     dependencies: {}
     hash:
-      md5: 273661a1f87b886c14ee0ab10a18ab89
-      sha256: 4c0d9e7d722b2a5ef5ca460c19ddd1f8a33342bf254c6af0b93164cdf257b111
+      md5: 51506939eb1e730edd502e89817c6466
+      sha256: 9e06e3938883e2f16168e07085e33f4f21ebb456e794864326c83563e75e67e8
     manager: conda
     name: conda-forge-pinning
     optional: false
     platform: linux-64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/conda-forge-pinning-2024.03.25.09.21.25-hd8ed1ab_0.conda
-    version: 2024.03.25.09.21.25
+      https://conda.anaconda.org/conda-forge/noarch/conda-forge-pinning-2024.03.25.15.50.22-hd8ed1ab_0.conda
+    version: 2024.03.25.15.50.22
   - category: main
     dependencies: {}
     hash:
-      md5: 273661a1f87b886c14ee0ab10a18ab89
-      sha256: 4c0d9e7d722b2a5ef5ca460c19ddd1f8a33342bf254c6af0b93164cdf257b111
+      md5: 51506939eb1e730edd502e89817c6466
+      sha256: 9e06e3938883e2f16168e07085e33f4f21ebb456e794864326c83563e75e67e8
     manager: conda
     name: conda-forge-pinning
     optional: false
     platform: osx-64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/conda-forge-pinning-2024.03.25.09.21.25-hd8ed1ab_0.conda
-    version: 2024.03.25.09.21.25
+      https://conda.anaconda.org/conda-forge/noarch/conda-forge-pinning-2024.03.25.15.50.22-hd8ed1ab_0.conda
+    version: 2024.03.25.15.50.22
   - category: main
     dependencies: {}
     hash:
-      md5: 273661a1f87b886c14ee0ab10a18ab89
-      sha256: 4c0d9e7d722b2a5ef5ca460c19ddd1f8a33342bf254c6af0b93164cdf257b111
+      md5: 51506939eb1e730edd502e89817c6466
+      sha256: 9e06e3938883e2f16168e07085e33f4f21ebb456e794864326c83563e75e67e8
     manager: conda
     name: conda-forge-pinning
     optional: false
     platform: osx-arm64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/conda-forge-pinning-2024.03.25.09.21.25-hd8ed1ab_0.conda
-    version: 2024.03.25.09.21.25
+      https://conda.anaconda.org/conda-forge/noarch/conda-forge-pinning-2024.03.25.15.50.22-hd8ed1ab_0.conda
+    version: 2024.03.25.15.50.22
   - category: main
     dependencies:
       click: '>=8'
@@ -2360,15 +2360,15 @@ package:
       toolz: ''
       vsts-python-api: ''
     hash:
-      md5: 7a0e0154d4fc4a8d1aab70edee143bd8
-      sha256: 1f76e746b5eb436a5783a74d0c3a9eb30afbbd2e478e7c30964ea26756d2a368
+      md5: 413eaacf695be9f76beff58e31848cc3
+      sha256: d53d08698c9b61c1afb852e549a2b0a4dbafdaa9c523c5f4e6b74ac73d0dafdb
     manager: conda
     name: conda-smithy
     optional: false
     platform: linux-64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/conda-smithy-3.33.0-pyhd8ed1ab_0.conda
-    version: 3.33.0
+      https://conda.anaconda.org/conda-forge/noarch/conda-smithy-3.34.0-pyhd8ed1ab_0.conda
+    version: 3.34.0
   - category: main
     dependencies:
       cirun: '>=0.30'
@@ -2393,15 +2393,15 @@ package:
       toolz: ''
       vsts-python-api: ''
     hash:
-      md5: 7a0e0154d4fc4a8d1aab70edee143bd8
-      sha256: 1f76e746b5eb436a5783a74d0c3a9eb30afbbd2e478e7c30964ea26756d2a368
+      md5: 413eaacf695be9f76beff58e31848cc3
+      sha256: d53d08698c9b61c1afb852e549a2b0a4dbafdaa9c523c5f4e6b74ac73d0dafdb
     manager: conda
     name: conda-smithy
     optional: false
     platform: osx-64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/conda-smithy-3.33.0-pyhd8ed1ab_0.conda
-    version: 3.33.0
+      https://conda.anaconda.org/conda-forge/noarch/conda-smithy-3.34.0-pyhd8ed1ab_0.conda
+    version: 3.34.0
   - category: main
     dependencies:
       cirun: '>=0.30'
@@ -2426,15 +2426,15 @@ package:
       toolz: ''
       vsts-python-api: ''
     hash:
-      md5: 7a0e0154d4fc4a8d1aab70edee143bd8
-      sha256: 1f76e746b5eb436a5783a74d0c3a9eb30afbbd2e478e7c30964ea26756d2a368
+      md5: 413eaacf695be9f76beff58e31848cc3
+      sha256: d53d08698c9b61c1afb852e549a2b0a4dbafdaa9c523c5f4e6b74ac73d0dafdb
     manager: conda
     name: conda-smithy
     optional: false
     platform: osx-arm64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/conda-smithy-3.33.0-pyhd8ed1ab_0.conda
-    version: 3.33.0
+      https://conda.anaconda.org/conda-forge/noarch/conda-smithy-3.34.0-pyhd8ed1ab_0.conda
+    version: 3.34.0
   - category: main
     dependencies:
       python: '>=3.8'
@@ -3494,38 +3494,38 @@ package:
     dependencies:
       python: '>=3.7'
     hash:
-      md5: 0c1729b74a8152fde6a38ba0a2ab9f45
-      sha256: 4d742d91412d1f163e5399d2b50c5d479694ebcd309127abb549ca3977f89d2b
+      md5: 5b5b39c2cd4d0de98215395ca918f3f4
+      sha256: 6d3ff7c3a977768ddd1c77e9ba92ad1c86d2882553b303814b0de290b89402d4
     manager: conda
     name: filelock
     optional: false
     platform: linux-64
-    url: https://conda.anaconda.org/conda-forge/noarch/filelock-3.13.1-pyhd8ed1ab_0.conda
-    version: 3.13.1
+    url: https://conda.anaconda.org/conda-forge/noarch/filelock-3.13.2-pyhd8ed1ab_0.conda
+    version: 3.13.2
   - category: main
     dependencies:
       python: '>=3.7'
     hash:
-      md5: 0c1729b74a8152fde6a38ba0a2ab9f45
-      sha256: 4d742d91412d1f163e5399d2b50c5d479694ebcd309127abb549ca3977f89d2b
+      md5: 5b5b39c2cd4d0de98215395ca918f3f4
+      sha256: 6d3ff7c3a977768ddd1c77e9ba92ad1c86d2882553b303814b0de290b89402d4
     manager: conda
     name: filelock
     optional: false
     platform: osx-64
-    url: https://conda.anaconda.org/conda-forge/noarch/filelock-3.13.1-pyhd8ed1ab_0.conda
-    version: 3.13.1
+    url: https://conda.anaconda.org/conda-forge/noarch/filelock-3.13.2-pyhd8ed1ab_0.conda
+    version: 3.13.2
   - category: main
     dependencies:
       python: '>=3.7'
     hash:
-      md5: 0c1729b74a8152fde6a38ba0a2ab9f45
-      sha256: 4d742d91412d1f163e5399d2b50c5d479694ebcd309127abb549ca3977f89d2b
+      md5: 5b5b39c2cd4d0de98215395ca918f3f4
+      sha256: 6d3ff7c3a977768ddd1c77e9ba92ad1c86d2882553b303814b0de290b89402d4
     manager: conda
     name: filelock
     optional: false
     platform: osx-arm64
-    url: https://conda.anaconda.org/conda-forge/noarch/filelock-3.13.1-pyhd8ed1ab_0.conda
-    version: 3.13.1
+    url: https://conda.anaconda.org/conda-forge/noarch/filelock-3.13.2-pyhd8ed1ab_0.conda
+    version: 3.13.2
   - category: main
     dependencies:
       python: '>=3.6'
@@ -7373,39 +7373,39 @@ package:
       libstdcxx-ng: '>=12'
       libzlib: '>=1.2.13,<1.3.0a0'
     hash:
-      md5: 66d4f5d8256542d9ebfa341d690c5e03
-      sha256: 835d9c7072ad8fd247f2c4946b5b61f60ba8fc836d3a0623e09def0320d02161
+      md5: 84271c00f5804bbc1ef7c525d1e4f405
+      sha256: dcddda4248b3b04272de8b03675b3d41ac3eff4e306bef7b3a6749277fd7359b
     manager: conda
     name: libsolv
     optional: false
     platform: linux-64
-    url: https://conda.anaconda.org/conda-forge/linux-64/libsolv-0.7.28-hfc55251_0.conda
+    url: https://conda.anaconda.org/conda-forge/linux-64/libsolv-0.7.28-hfc55251_1.conda
     version: 0.7.28
   - category: main
     dependencies:
       libcxx: '>=16'
       libzlib: '>=1.2.13,<1.3.0a0'
     hash:
-      md5: a30cb23edd3ef8c8a7a8e83c1bee9295
-      sha256: 23ae8512daa05c0c0f49f4649f1405af86a72460419aca07abed904243691017
+      md5: 9b0dddcfdaa868197742a0590b42e67c
+      sha256: 8d710885d38080f6ac9b2b92e62ad790e6e04932ae326f5d4fc31e56ca49a093
     manager: conda
     name: libsolv
     optional: false
     platform: osx-64
-    url: https://conda.anaconda.org/conda-forge/osx-64/libsolv-0.7.28-h2d185b6_0.conda
+    url: https://conda.anaconda.org/conda-forge/osx-64/libsolv-0.7.28-h2d185b6_1.conda
     version: 0.7.28
   - category: main
     dependencies:
       libcxx: '>=16'
       libzlib: '>=1.2.13,<1.3.0a0'
     hash:
-      md5: 6a6eaef4b49400966afc6adf5ed65ef7
-      sha256: 1d21f80c062f2ef4cba1aeec3ee3edc643aa26aa24384423972288443a449f25
+      md5: 816b766780f09240349b373209c66026
+      sha256: aa7f4d65116a7c80807b6c90d2294056f7a6ba7a877629ca68a7851dcac1462a
     manager: conda
     name: libsolv
     optional: false
     platform: osx-arm64
-    url: https://conda.anaconda.org/conda-forge/osx-arm64/libsolv-0.7.28-h1059232_0.conda
+    url: https://conda.anaconda.org/conda-forge/osx-arm64/libsolv-0.7.28-h1059232_1.conda
     version: 0.7.28
   - category: main
     dependencies:

diff --git a/conda_forge_tick/feedstock_parser.py b/conda_forge_tick/feedstock_parser.py
@@ -30,9 +30,7 @@
 # that would be available in a bootstrapping scenario
 # for these nodes, we only use the bootstrap requirements
 # to build graph edges
-BOOTSTRAP_MAPPINGS = {
-    "flit": {"flit-core"},
-}
+BOOTSTRAP_MAPPINGS = {}
 
 
 def _get_requirements(