Skip to content

Commit d82a270

Browse files
author
Andrey Senyaev
committed
Updated Github Actions to python 3.10 and fixed following issues
1 parent 80f0790 commit d82a270

14 files changed

+58
-51
lines changed

‎.github/workflows/build_wheels_linux.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
os: [ubuntu-latest]
26-
python-version: [3.6, 3.7, 3.8, 3.9]
26+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
2727
platform: [x64]
2828
with_contrib: [0, 1]
2929
without_gui: [0, 1]
@@ -38,9 +38,10 @@ jobs:
3838
TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
3939
MB_ML_VER: 2014
4040
NP_TEST_DEP: numpy==1.19.4
41+
NP_TEST_DEP_3_10: numpy==1.21.2
4142
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4243
CONFIG_PATH: travis_config.sh
43-
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
44+
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
4445
USE_CCACHE: 1
4546
UNICODE_WIDTH: 32
4647
SDIST: ${{ matrix.build_sdist || 0 }}
@@ -63,8 +64,7 @@ jobs:
6364
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
6465
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
6566
if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
66-
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
67-
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
67+
if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_3_10)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
6868
6969
- name: build
7070
run: source scripts/build.sh
@@ -107,7 +107,7 @@ jobs:
107107
NP_TEST_DEP: numpy==1.19.4
108108
TRAVIS_BUILD_DIR: ${{ github.workspace }}
109109
CONFIG_PATH: travis_config.sh
110-
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
110+
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
111111
USE_CCACHE: 1
112112
UNICODE_WIDTH: 32
113113
SDIST: ${{ matrix.build_sdist || 0 }}
@@ -135,8 +135,6 @@ jobs:
135135
run: |
136136
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
137137
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
138-
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
139-
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
140138
141139
- name: before install
142140
run: |

‎.github/workflows/build_wheels_linux_arm.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
os: [ARM64]
26-
python-version: [3.6, 3.7, 3.8, 3.9]
26+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
2727
platform: [x64]
2828
with_contrib: [0, 1]
2929
without_gui: [0, 1]
@@ -39,9 +39,10 @@ jobs:
3939
PLAT: aarch64
4040
MB_ML_VER: 2014
4141
NP_TEST_DEP: numpy==1.19.4
42+
NP_TEST_DEP_3_10: numpy==1.21.2
4243
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4344
CONFIG_PATH: travis_config.sh
44-
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
45+
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
4546
DOCKER_TEST_IMAGE: multibuild/xenial_arm64v8
4647
USE_CCACHE: 0
4748
UNICODE_WIDTH: 32
@@ -63,8 +64,7 @@ jobs:
6364
- name: Setup Environment variables
6465
run: |
6566
if [ "ARM64" == "${{ matrix.os }}" ]; then echo "PLAT=aarch64" >> $GITHUB_ENV; fi
66-
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
67-
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
67+
if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_3_10)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
6868
6969
- name: build
7070
run: source scripts/build.sh

‎.github/workflows/build_wheels_macos.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,23 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
os: [macos-latest]
26-
python-version: [3.6, 3.7, 3.8, 3.9]
25+
os: [macos-10.15, macos-11]
26+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
2727
platform: [x64]
2828
with_contrib: [0, 1]
2929
without_gui: [0, 1]
3030
build_sdist: [0]
31+
exclude:
32+
- os: macos-10.15
33+
python-version: '3.10'
34+
- os: macos-11
35+
python-version: '3.6'
36+
- os: macos-11
37+
python-version: '3.7'
38+
- os: macos-11
39+
python-version: '3.8'
40+
- os: macos-11
41+
python-version: '3.9'
3142

3243
env:
3344
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
@@ -38,9 +49,11 @@ jobs:
3849
TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
3950
MB_ML_VER: 2014
4051
NP_TEST_DEP: numpy==1.19.4
52+
NP_TEST_DEP_3_10: numpy==1.21.2
4153
TRAVIS_BUILD_DIR: ${{ github.workspace }}
54+
TRAVIS_OS_NAME: osx
4255
CONFIG_PATH: travis_config.sh
43-
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
56+
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
4457
USE_CCACHE: 1
4558
UNICODE_WIDTH: 32
4659
SDIST: ${{ matrix.build_sdist || 0 }}
@@ -58,22 +71,13 @@ jobs:
5871
if: github.event_name == 'pull_request'
5972
run: git submodule update --remote
6073

61-
- name: Set up Python ${{ matrix.python-version }}
62-
uses: actions/setup-python@v2
63-
if: ${{ 'macos-latest' == matrix.os }}
64-
with:
65-
python-version: ${{ matrix.python-version }}
66-
architecture: ${{ matrix.platform }}
67-
6874
- name: Setup Environment variables
6975
run: |
70-
if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
7176
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
7277
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
7378
if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
7479
if [ "x86" == "${{ matrix.platform }}" ]; then echo "PLAT=i686" >> $GITHUB_ENV; fi
75-
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
76-
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
80+
if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_3_10)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
7781
7882
- name: before install
7983
run: |

‎.github/workflows/build_wheels_macos_m1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
os: [macOS-M1]
23-
python-version: [3.7, 3.8, 3.9]
23+
python-version: ['3.7', '3.8', '3.9', '3.10']
2424
platform: [x64]
2525
with_contrib: [0, 1]
2626
without_gui: [0, 1]

‎.github/workflows/build_wheels_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
os: [windows-latest]
25-
python-version: [3.6, 3.7, 3.8, 3.9]
25+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
2626
platform: [x86, x64]
2727
with_contrib: [0, 1]
2828
without_gui: [0, 1]

‎docker/manylinux2014/Dockerfile_aarch64

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
2828
rm -rf ~/openssl_build
2929

3030
RUN cd ~/ffmpeg_sources && \
31-
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.14.01/nasm-2.14.01.tar.bz2 && \
32-
tar -xf nasm-2.14.01.tar.bz2 && cd nasm-2.14.01 && ./autogen.sh && \
31+
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.15.04/nasm-2.15.04.tar.bz2 && \
32+
tar -xf nasm-2.15.04.tar.bz2 && cd nasm-2.15.04 && ./autogen.sh && \
3333
./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
3434
make -j$(getconf _NPROCESSORS_ONLN) && \
3535
make install
@@ -50,9 +50,9 @@ RUN cd ~/ffmpeg_sources && \
5050
make install
5151

5252
RUN cd ~/ffmpeg_sources && \
53-
curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
54-
tar -xf ffmpeg-snapshot.tar.bz2 && \
55-
cd ffmpeg && \
53+
curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
54+
tar -xf ffmpeg-4.3.2.tar.bz2 && \
55+
cd ffmpeg-4.3.2 && \
5656
PATH=~/bin:$PATH && \
5757
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
5858
make -j$(getconf _NPROCESSORS_ONLN) && \

‎docker/manylinux2014/Dockerfile_i686

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ RUN mkdir ~/ffmpeg_sources && \
3030
rm -rf ~/openssl_build
3131

3232
RUN cd ~/ffmpeg_sources && \
33-
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.14.01/nasm-2.14.01.tar.bz2 && \
34-
tar -xf nasm-2.14.01.tar.bz2 && cd nasm-2.14.01 && ./autogen.sh && \
33+
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.15.04/nasm-2.15.04.tar.bz2 && \
34+
tar -xf nasm-2.15.04.tar.bz2 && cd nasm-2.15.04 && ./autogen.sh && \
3535
linux32 ./configure && \
3636
make -j$(getconf _NPROCESSORS_ONLN) && \
3737
make install
@@ -52,9 +52,9 @@ RUN cd ~/ffmpeg_sources && \
5252
make install
5353

5454
RUN cd ~/ffmpeg_sources && \
55-
curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
56-
tar -xf ffmpeg-snapshot.tar.bz2 && \
57-
cd ffmpeg && \
55+
curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
56+
tar -xf ffmpeg-4.3.2.tar.bz2 && \
57+
cd ffmpeg-4.3.2 && \
5858
PATH=~/bin:$PATH && \
5959
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" linux32 ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
6060
make -j$(getconf _NPROCESSORS_ONLN) && \

‎docker/manylinux2014/Dockerfile_x86_64

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
2828
rm -rf ~/openssl_build
2929

3030
RUN cd ~/ffmpeg_sources && \
31-
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.14.01/nasm-2.14.01.tar.bz2 && \
32-
tar -xf nasm-2.14.01.tar.bz2 && cd nasm-2.14.01 && ./autogen.sh && \
31+
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.15.04/nasm-2.15.04.tar.bz2 && \
32+
tar -xf nasm-2.15.04.tar.bz2 && cd nasm-2.15.04 && ./autogen.sh && \
3333
./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
3434
make -j$(getconf _NPROCESSORS_ONLN) && \
3535
make install
@@ -50,9 +50,9 @@ RUN cd ~/ffmpeg_sources && \
5050
make install
5151

5252
RUN cd ~/ffmpeg_sources && \
53-
curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
54-
tar -xf ffmpeg-snapshot.tar.bz2 && \
55-
cd ffmpeg && \
53+
curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
54+
tar -xf ffmpeg-4.3.2.tar.bz2 && \
55+
cd ffmpeg-4.3.2 && \
5656
PATH=~/bin:$PATH && \
5757
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
5858
make -j$(getconf _NPROCESSORS_ONLN) && \

‎multibuild

‎pyproject.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
requires = [
33
"setuptools", "wheel", "scikit-build", "cmake", "pip",
44
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
5-
"numpy==1.19.3; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'",
6-
"numpy==1.21.0; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm64'",
5+
"numpy==1.21.2; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'",
6+
"numpy==1.21.2; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm64'",
77
"numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
88
"numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
9-
"numpy==1.19.3; python_version>='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
9+
"numpy==1.21.2; python_version>='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
10+
"numpy==1.21.2; python_version>='3.10' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
1011
]

‎scripts/build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@ echo $ENABLE_CONTRIB > contrib.enabled
1515
echo $ENABLE_HEADLESS > headless.enabled
1616
set -x
1717
build_wheel $REPO_DIR $PLAT
18-
rm wheelhouse/numpy*

‎setup.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,17 @@ def main():
2929
if sys.version_info[:2] >= (3, 8):
3030
minimum_supported_numpy = "1.17.3"
3131
if sys.version_info[:2] >= (3, 9):
32-
minimum_supported_numpy = "1.19.3"
32+
minimum_supported_numpy = "1.21.2"
33+
if sys.version_info[:2] >= (3, 10):
34+
minimum_supported_numpy = "1.21.2"
3335

3436
# linux arm64 is a special case
3537
if sys.platform.startswith("linux") and sys.version_info[:2] >= (3, 6) and platform.machine() == "aarch64":
36-
minimum_supported_numpy = "1.19.3"
38+
minimum_supported_numpy = "1.21.2"
3739

3840
# macos arm64 is a special case
3941
if sys.platform == "darwin" and sys.version_info[:2] >= (3, 6) and platform.machine() == "arm64":
40-
minimum_supported_numpy = "1.21.0"
42+
minimum_supported_numpy = "1.21.2"
4143

4244
numpy_version = "numpy>=%s" % minimum_supported_numpy
4345

‎travis_config.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ function bdist_wheel_cmd {
2020
TOOLS_PATH=/opt/_internal/tools
2121
/opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
2222
source $TOOLS_PATH/bin/activate
23-
python patch_auditwheel_whitelist.py
23+
python$PYTHON_VERSION -m pip install auditwheel==3.2.0
24+
python$PYTHON_VERSION patch_auditwheel_whitelist.py
25+
# to avoid issues with numpy wheels
26+
rm /io/wheelhouse/numpy*
2427
deactivate
2528
fi
2629
if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi

‎travis_multibuild_customize.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
44
set -x
55
REPO_DIR=$(dirname "${BASH_SOURCE[0]}")
6-
DOCKER_IMAGE='quay.io/skvark/manylinux2014_$plat'
6+
DOCKER_IMAGE='quay.io/asenyaev/manylinux2014_$plat'

0 commit comments

Comments
 (0)