Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rebuild for ffmpeg44 #15

Merged
merged 4 commits into from
Apr 1, 2022
Merged

Rebuild for ffmpeg44 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6cf9fb0
Rebuild for ffmpeg44
regro-cf-autotick-bot Mar 25, 2022
ff460b3
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.18.0, and co…
regro-cf-autotick-bot Mar 25, 2022
fd9d8d0
Delete pypy37 because it never worked.
hmaarrfk Mar 30, 2022
7af607c
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and co…
Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion .ci_support/README
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 0 additions & 25 deletions .ci_support/linux_64_python3.6.____cpython.yaml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions .ci_support/linux_64_python3.7.____73_pypy.yaml
View file
Open in desktop

This file was deleted.

11 changes: 4 additions & 7 deletions .ci_support/linux_64_python3.7.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -20,6 +20,3 @@ python:
- 3.7.* *_cpython
target_platform:
- linux-64
zip_keys:
- - cdt_name
- docker_image
11 changes: 4 additions & 7 deletions .ci_support/linux_64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -20,6 +20,3 @@ python:
- 3.8.* *_cpython
target_platform:
- linux-64
zip_keys:
- - cdt_name
- docker_image
11 changes: 4 additions & 7 deletions .ci_support/linux_64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -20,6 +20,3 @@ python:
- 3.9.* *_cpython
target_platform:
- linux-64
zip_keys:
- - cdt_name
- docker_image
7 changes: 7 additions & 0 deletions .ci_support/migrations/ffmpeg44.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
__migrator:
build_number: 1
kind: version
migration_number: 1
ffmpeg:
- '4.4'
migrator_ts: 1645963201.9878001
30 changes: 0 additions & 30 deletions .ci_support/migrations/pypy37.yaml
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions .ci_support/migrations/python39.yaml
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions .ci_support/osx_64_python3.6.____cpython.yaml
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions .ci_support/osx_64_python3.7.____73_pypy.yaml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions .ci_support/osx_64_python3.7.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions .gitattributes
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading