Merge pull request #7 from regro-cf-autotick-bot/rebuild-python310-0-…

…1_hfb5aed Rebuild for python310
conda-forge · Nov 11, 2021 · bf022f9 · bf022f9
2 parents 3719cfa + dbd1298
commit bf022f9
Show file tree

Hide file tree

Showing 23 changed files with 239 additions and 179 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/...pport/linux_64_python3.6.____73_pypy.yaml → ...port/linux_64_python3.10.____cpython.yaml b/...pport/linux_64_python3.6.____73_pypy.yaml → ...port/linux_64_python3.10.____cpython.yaml
@@ -1,14 +1,19 @@
+cdt_name:
+- cos6
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 docker_image:
-- condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-comp7
 pin_run_as_build:
   python:
     min_pin: x.x
     max_pin: x.x
 python:
-- 3.6.* *_73_pypy
+- 3.10.* *_cpython
 target_platform:
 - linux-64
+zip_keys:
+- - cdt_name
+  - docker_image
diff --git a/.ci_support/linux_64_python3.6.____cpython.yaml b/.ci_support/linux_64_python3.6.____cpython.yaml
diff --git a/.ci_support/linux_64_python3.7.____cpython.yaml b/.ci_support/linux_64_python3.7.____cpython.yaml
@@ -1,9 +1,11 @@
+cdt_name:
+- cos6
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 docker_image:
-- condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-comp7
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -12,3 +14,6 @@ python:
 - 3.7.* *_cpython
 target_platform:
 - linux-64
+zip_keys:
+- - cdt_name
+  - docker_image
diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml
@@ -1,9 +1,11 @@
+cdt_name:
+- cos6
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 docker_image:
-- condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-comp7
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -12,3 +14,6 @@ python:
 - 3.8.* *_cpython
 target_platform:
 - linux-64
+zip_keys:
+- - cdt_name
+  - docker_image
diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml
@@ -1,9 +1,11 @@
+cdt_name:
+- cos6
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 docker_image:
-- condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-comp7
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -12,3 +14,6 @@ python:
 - 3.9.* *_cpython
 target_platform:
 - linux-64
+zip_keys:
+- - cdt_name
+  - docker_image
diff --git a/.ci_support/migrations/pypy.yaml b/.ci_support/migrations/pypy.yaml
diff --git a/.ci_support/migrations/python39.yaml → .ci_support/migrations/python310.yaml b/.ci_support/migrations/python39.yaml → .ci_support/migrations/python310.yaml
@@ -1,26 +1,34 @@
-migrator_ts: 1602104489
+migrator_ts: 1634137107
 __migrator:
-    migration_number: 2
+    migration_number: 1
     operation: key_add
     primary_key: python
     ordering:
         python:
             - 3.6.* *_cpython
             - 3.7.* *_cpython
             - 3.8.* *_cpython
-            - 3.9.* *_cpython   # new entry
+            - 3.9.* *_cpython
+            - 3.10.* *_cpython  # new entry
             - 3.6.* *_73_pypy
+            - 3.7.* *_73_pypy
     paused: false
-    pr_limit: 50
+    longterm: True
+    pr_limit: 40
+    max_solver_attempts: 10  # this will make the bot retry "not solvable" stuff 10 times
     exclude:
       # this shouldn't attempt to modify the python feedstocks
       - python
       - pypy3.6
       - pypy-meta
+      - cross-python
+      - python_abi
+    exclude_pinned_pkgs: false
+
 python:
-  - 3.9.* *_cpython
+  - 3.10.* *_cpython
 # additional entries to add for zip_keys
 numpy:
-  - 1.19
+  - 1.21
 python_impl:
   - cpython
diff --git a/...support/osx_64_python3.6.____73_pypy.yaml → ...upport/osx_64_python3.10.____cpython.yaml b/...support/osx_64_python3.6.____73_pypy.yaml → ...upport/osx_64_python3.10.____cpython.yaml
@@ -1,7 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 macos_machine:
@@ -11,6 +11,6 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 python:
-- 3.6.* *_73_pypy
+- 3.10.* *_cpython
 target_platform:
 - osx-64
diff --git a/.ci_support/osx_64_python3.6.____cpython.yaml b/.ci_support/osx_64_python3.6.____cpython.yaml
diff --git a/.ci_support/osx_64_python3.7.____cpython.yaml b/.ci_support/osx_64_python3.7.____cpython.yaml
@@ -1,7 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 macos_machine:

diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml
@@ -1,7 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 macos_machine:

diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml
@@ -1,7 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 macos_machine:

diff --git a/.gitattributes b/.gitattributes