Merge pull request #15 from regro-cf-autotick-bot/rebuild-ffmpeg44-0-…

…1_h3de3da Rebuild for ffmpeg44
conda-forge · Apr 1, 2022 · a903882 · a903882
2 parents abc0825 + 7af607c
commit a903882
Show file tree

Hide file tree

Showing 25 changed files with 279 additions and 298 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/.ci_support/README b/.ci_support/README
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.____73_pypy.yaml b/.ci_support/linux_64_python3.7.____73_pypy.yaml
diff --git a/.ci_support/linux_64_python3.7.____cpython.yaml b/.ci_support/linux_64_python3.7.____cpython.yaml
@@ -1,17 +1,17 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '9'
+- '10'
 cdt_name:
 - cos6
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 docker_image:
-- quay.io/condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 ffmpeg:
-- '4.3'
+- '4.4'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -20,6 +20,3 @@ 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,17 +1,17 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '9'
+- '10'
 cdt_name:
 - cos6
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 docker_image:
-- quay.io/condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 ffmpeg:
-- '4.3'
+- '4.4'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -20,6 +20,3 @@ 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,17 +1,17 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '9'
+- '10'
 cdt_name:
 - cos6
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 docker_image:
-- quay.io/condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 ffmpeg:
-- '4.3'
+- '4.4'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -20,6 +20,3 @@ python:
 - 3.9.* *_cpython
 target_platform:
 - linux-64
-zip_keys:
-- - cdt_name
-  - docker_image
diff --git a/.ci_support/migrations/ffmpeg44.yaml b/.ci_support/migrations/ffmpeg44.yaml
@@ -0,0 +1,7 @@
+__migrator:
+  build_number: 1
+  kind: version
+  migration_number: 1
+ffmpeg:
+- '4.4'
+migrator_ts: 1645963201.9878001
diff --git a/.ci_support/migrations/pypy37.yaml b/.ci_support/migrations/pypy37.yaml
diff --git a/.ci_support/migrations/python39.yaml b/.ci_support/migrations/python39.yaml
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.____73_pypy.yaml b/.ci_support/osx_64_python3.7.____73_pypy.yaml
diff --git a/.ci_support/osx_64_python3.7.____cpython.yaml b/.ci_support/osx_64_python3.7.____cpython.yaml
@@ -3,13 +3,13 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '11'
+- '12'
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 ffmpeg:
-- '4.3'
+- '4.4'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:

diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml
@@ -3,13 +3,13 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '11'
+- '12'
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 ffmpeg:
-- '4.3'
+- '4.4'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:

diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml
@@ -3,13 +3,13 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '11'
+- '12'
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 ffmpeg:
-- '4.3'
+- '4.4'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:

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