Updated Github Actions to python 3.10 and fixed following issues#556

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

Merged
asenyaev merged 5 commits into from
Oct 15, 2021
Merged

Updated Github Actions to python 3.10 and fixed following issues #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d82a270
Updated Github Actions to python 3.10 and fixed following issues
Oct 7, 2021
0114953
Fixed the version of numpy for linux aarch64 and python3.6
Oct 8, 2021
9f43c0b
Changed the image for tests on linux arm
Oct 8, 2021
4d0f6d2
Fixed if condition for numpy test version on linux arm and renamed nu…
Oct 9, 2021
fdcbcb1
Added lowest numpy version support instead of latest
Oct 9, 2021
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
12 changes: 5 additions & 7 deletions .github/workflows/build_wheels_linux.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand All@@ -38,9 +38,10 @@ jobs:
TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
MB_ML_VER: 2014
NP_TEST_DEP: numpy==1.19.4
NP_TEST_DEP_LATEST: numpy==1.21.2
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
USE_CCACHE: 1
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

- name: build
run: source scripts/build.sh
Expand DownExpand Up@@ -107,7 +107,7 @@ jobs:
NP_TEST_DEP: numpy==1.19.4
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
USE_CCACHE: 1
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0 }}
Expand DownExpand Up@@ -135,8 +135,6 @@ jobs:
run: |
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;

- name: before install
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build_wheels_linux_arm.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
os: [ARM64]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand All@@ -39,10 +39,11 @@ jobs:
PLAT: aarch64
MB_ML_VER: 2014
NP_TEST_DEP: numpy==1.19.4
NP_TEST_DEP_LATEST: numpy==1.21.2
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
DOCKER_TEST_IMAGE: multibuild/xenial_arm64v8
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
USE_CCACHE: 0
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
- name: Setup Environment variables
run: |
if [ "ARM64" == "${{ matrix.os }}" ]; then echo "PLAT=aarch64" >> $GITHUB_ENV; fi
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

- name: build
run: source scripts/build.sh
Expand Down
30 changes: 17 additions & 13 deletions .github/workflows/build_wheels_macos.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,23 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
os: [macos-10.15, macos-11]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
build_sdist: [0]
exclude:
- os: macos-10.15
python-version: '3.10'
- os: macos-11
python-version: '3.6'
- os: macos-11
python-version: '3.7'
- os: macos-11
python-version: '3.8'
- os: macos-11
python-version: '3.9'

env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
Expand All@@ -38,9 +49,11 @@ jobs:
TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
MB_ML_VER: 2014
NP_TEST_DEP: numpy==1.19.4
NP_TEST_DEP_LATEST: numpy==1.21.2
TRAVIS_BUILD_DIR: ${{ github.workspace }}
TRAVIS_OS_NAME: osx
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
USE_CCACHE: 1
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -58,22 +71,13 @@ jobs:
if: github.event_name == 'pull_request'
run: git submodule update --remote

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
if: ${{ 'macos-latest' == matrix.os }}
with:
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.platform }}

- name: Setup Environment variables
run: |
if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
if [ "x86" == "${{ matrix.platform }}" ]; then echo "PLAT=i686" >> $GITHUB_ENV; fi
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

- name: before install
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_wheels_macos_m1.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os: [macOS-M1]
python-version: [3.7, 3.8, 3.9]
python-version: ['3.7', '3.8', '3.9', '3.10']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_wheels_windows.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
platform: [x86, x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down
10 changes: 5 additions & 5 deletions docker/manylinux2014/Dockerfile_aarch64
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
tar -xf ffmpeg-snapshot.tar.bz2 && \
cd ffmpeg && \
curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
tar -xf ffmpeg-4.3.2.tar.bz2 && \
cd ffmpeg-4.3.2 && \
PATH=~/bin:$PATH && \
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" && \
make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down
10 changes: 5 additions & 5 deletions docker/manylinux2014/Dockerfile_i686
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ RUN mkdir ~/ffmpeg_sources && \
rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
tar -xf ffmpeg-snapshot.tar.bz2 && \
cd ffmpeg && \
curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
tar -xf ffmpeg-4.3.2.tar.bz2 && \
cd ffmpeg-4.3.2 && \
PATH=~/bin:$PATH && \
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" && \
make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down
10 changes: 5 additions & 5 deletions docker/manylinux2014/Dockerfile_x86_64
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
tar -xf ffmpeg-snapshot.tar.bz2 && \
cd ffmpeg && \
curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
tar -xf ffmpeg-4.3.2.tar.bz2 && \
cd ffmpeg-4.3.2 && \
PATH=~/bin:$PATH && \
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" && \
make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down
2 changes: 1 addition & 1 deletion multibuild
Open in desktop
Submodule multibuild updated 20 files
+17 −2 .travis.yml
+1 −1 LICENSE
+181 −28 README.rst
+94 −10 common_utils.sh
+33 −15 configure_build.sh
+3 −1 docker_build_wrap.sh
+38 −19 library_builders.sh
+9 −2 manylinux_utils.sh
+139 −13 osx_utils.sh
+11 −0 tests/test_common_utils.sh
+3 −1 tests/test_fill_pyver.sh
+10 −5 tests/test_library_builders.sh
+6 −5 tests/test_manylinux_utils_docker.sh
+8 −2 tests/test_multibuild.sh
+4 −0 tests/test_osx_utils.sh
+9 −5 tests/test_python_install.sh
+1 −1 tests/test_supported_wheels.sh
+0 −5 travis_linux_steps.sh
+14 −0 travis_osx_steps.sh
+1 −1 travis_steps.sh
7 changes: 4 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@
requires = [
"setuptools", "wheel", "scikit-build", "cmake", "pip",
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
"numpy==1.19.3; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'",
"numpy==1.21.0; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm64'",
"numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
"numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
"numpy==1.19.3; python_version>='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
"numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
"numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
"numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
"numpy==1.21.2; python_version>='3.10'"
]
1 change: 0 additions & 1 deletion scripts/build.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
set -x
build_wheel $REPO_DIR $PLAT
rm wheelhouse/numpy*
2 changes: 2 additions & 0 deletions setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ def main():
minimum_supported_numpy = "1.17.3"
if sys.version_info[:2] >= (3, 9):
minimum_supported_numpy = "1.19.3"
if sys.version_info[:2] >= (3, 10):
minimum_supported_numpy = "1.21.2"

# linux arm64 is a special case
if sys.platform.startswith("linux") and sys.version_info[:2] >= (3, 6) and platform.machine() == "aarch64":
Expand Down
5 changes: 4 additions & 1 deletion travis_config.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,10 @@ function bdist_wheel_cmd {
TOOLS_PATH=/opt/_internal/tools
/opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
source $TOOLS_PATH/bin/activate
python patch_auditwheel_whitelist.py
python$PYTHON_VERSION -m pip install auditwheel==3.2.0
python$PYTHON_VERSION patch_auditwheel_whitelist.py
# to avoid issues with numpy wheels
rm /io/wheelhouse/numpy*
deactivate
fi
if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi
Expand Down
2 changes: 1 addition & 1 deletion travis_multibuild_customize.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
set -x
REPO_DIR=$(dirname "${BASH_SOURCE[0]}")
DOCKER_IMAGE='quay.io/skvark/manylinux2014_$plat'
DOCKER_IMAGE='quay.io/asenyaev/manylinux2014_$plat'
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Updated Github Actions to python 3.10 and fixed following issues#556

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

 Merged

asenyaev
merged 5 commits into

from

Oct 15, 2021
 Merged


Updated Github Actions to python 3.10 and fixed following issues
#556
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
d82a270

Updated Github Actions to python 3.10 and fixed following issues

Oct 7, 2021
0114953

Fixed the version of numpy for linux aarch64 and python3.6

Oct 8, 2021
9f43c0b

Changed the image for tests on linux arm

Oct 8, 2021
4d0f6d2

Fixed if condition for numpy test version on linux arm and renamed nu…

Oct 9, 2021
fdcbcb1

Added lowest numpy version support instead of latest

Oct 9, 2021

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


12 changes: 5 additions & 7 deletions
.github/workflows/build_wheels_linux.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 fail-fast: false
 matrix:
 os: [ubuntu-latest]
 python-version: [3.6, 3.7, 3.8, 3.9]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
Expand All@@ -38,9 +38,10 @@ jobs:
 TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: build
 run: source scripts/build.sh
Expand DownExpand Up@@ -107,7 +107,7 @@ jobs:
 NP_TEST_DEP: numpy==1.19.4
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand DownExpand Up@@ -135,8 +135,6 @@ jobs:
 run: |
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;

 - name: before install
 run: |
Expand Down

10 changes: 5 additions & 5 deletions
.github/workflows/build_wheels_linux_arm.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 fail-fast: false
 matrix:
 os: [ARM64]
 python-version: [3.6, 3.7, 3.8, 3.9]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
Expand All@@ -39,10 +39,11 @@ jobs:
 PLAT: aarch64
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_TEST_IMAGE: multibuild/xenial_arm64v8
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
 USE_CCACHE: 0
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
 - name: Setup Environment variables
 run: |
 if [ "ARM64" == "${{ matrix.os }}" ]; then echo "PLAT=aarch64" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: build
 run: source scripts/build.sh
Expand Down

30 changes: 17 additions & 13 deletions
.github/workflows/build_wheels_macos.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,23 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
 os: [macos-latest]
 python-version: [3.6, 3.7, 3.8, 3.9]
 os: [macos-10.15, macos-11]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
 build_sdist: [0]
 exclude:
 - os: macos-10.15
 python-version: '3.10'
 - os: macos-11
 python-version: '3.6'
 - os: macos-11
 python-version: '3.7'
 - os: macos-11
 python-version: '3.8'
 - os: macos-11
 python-version: '3.9'

 env:
 ACTIONS_ALLOW_UNSECURE_COMMANDS: true
Expand All@@ -38,9 +49,11 @@ jobs:
 TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 TRAVIS_OS_NAME: osx
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -58,22 +71,13 @@ jobs:
 if: github.event_name == 'pull_request'
 run: git submodule update --remote

 - name: Set up Python ${{ matrix.python-version }}
 uses: actions/setup-python@v2
 if: ${{ 'macos-latest' == matrix.os }}
 with:
 python-version: ${{ matrix.python-version }}
 architecture: ${{ matrix.platform }}

 - name: Setup Environment variables
 run: |
 if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
 if [ "x86" == "${{ matrix.platform }}" ]; then echo "PLAT=i686" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: before install
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/build_wheels_macos_m1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os: [macOS-M1]
python-version: [3.7, 3.8, 3.9]
python-version: ['3.7', '3.8', '3.9', '3.10']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/build_wheels_windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
platform: [x86, x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_aarch64

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_i686

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_x86_64

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

2 changes: 1 addition & 1 deletion
multibuild

Open in desktop


Submodule multibuild
updated

20 files


+17

−2

.travis.yml


+1

−1

LICENSE


+181

−28

README.rst


+94

−10

common_utils.sh


+33

−15

configure_build.sh


+3

−1

docker_build_wrap.sh


+38

−19

library_builders.sh


+9

−2

manylinux_utils.sh


+139

−13

osx_utils.sh


+11

−0

tests/test_common_utils.sh


+3

−1

tests/test_fill_pyver.sh


+10

−5

tests/test_library_builders.sh


+6

−5

tests/test_manylinux_utils_docker.sh


+8

−2

tests/test_multibuild.sh


+4

−0

tests/test_osx_utils.sh


+9

−5

tests/test_python_install.sh


+1

−1

tests/test_supported_wheels.sh


+0

−5

travis_linux_steps.sh


+14

−0

travis_osx_steps.sh


+1

−1

travis_steps.sh


7 changes: 4 additions & 3 deletions
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@
requires = [
 "setuptools", "wheel", "scikit-build", "cmake", "pip",
 "numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.19.3; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'",
 "numpy==1.21.0; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm64'",
 "numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.19.3; python_version>='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
 "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
 "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
 "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.21.2; python_version>='3.10'"
]

1 change: 0 additions & 1 deletion
scripts/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
set -x
build_wheel $REPO_DIR $PLAT
rm wheelhouse/numpy*

2 changes: 2 additions & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ def main():
 minimum_supported_numpy = "1.17.3"
 if sys.version_info[:2] >= (3, 9):
 minimum_supported_numpy = "1.19.3"
 if sys.version_info[:2] >= (3, 10):
 minimum_supported_numpy = "1.21.2"

 # linux arm64 is a special case
 if sys.platform.startswith("linux") and sys.version_info[:2] >= (3, 6) and platform.machine() == "aarch64":
Expand Down

5 changes: 4 additions & 1 deletion
travis_config.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,10 @@ function bdist_wheel_cmd {
 TOOLS_PATH=/opt/_internal/tools
 /opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
 source $TOOLS_PATH/bin/activate
 python patch_auditwheel_whitelist.py
 python$PYTHON_VERSION -m pip install auditwheel==3.2.0
 python$PYTHON_VERSION patch_auditwheel_whitelist.py
 # to avoid issues with numpy wheels
 rm /io/wheelhouse/numpy*
 deactivate
 fi
 if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi
Expand Down

2 changes: 1 addition & 1 deletion
travis_multibuild_customize.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
set -x
REPO_DIR=$(dirname "${BASH_SOURCE[0]}")
DOCKER_IMAGE='quay.io/skvark/manylinux2014_$plat'
DOCKER_IMAGE='quay.io/asenyaev/manylinux2014_$plat'

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Updated Github Actions to python 3.10 and fixed following issues#556

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

 Merged

asenyaev
merged 5 commits into

from

Oct 15, 2021
 Merged


Updated Github Actions to python 3.10 and fixed following issues
#556
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
d82a270

Updated Github Actions to python 3.10 and fixed following issues

Oct 7, 2021
0114953

Fixed the version of numpy for linux aarch64 and python3.6

Oct 8, 2021
9f43c0b

Changed the image for tests on linux arm

Oct 8, 2021
4d0f6d2

Fixed if condition for numpy test version on linux arm and renamed nu…

Oct 9, 2021
fdcbcb1

Added lowest numpy version support instead of latest

Oct 9, 2021

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


12 changes: 5 additions & 7 deletions
.github/workflows/build_wheels_linux.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 fail-fast: false
 matrix:
 os: [ubuntu-latest]
 python-version: [3.6, 3.7, 3.8, 3.9]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
Expand All@@ -38,9 +38,10 @@ jobs:
 TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: build
 run: source scripts/build.sh
Expand DownExpand Up@@ -107,7 +107,7 @@ jobs:
 NP_TEST_DEP: numpy==1.19.4
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand DownExpand Up@@ -135,8 +135,6 @@ jobs:
 run: |
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;

 - name: before install
 run: |
Expand Down

10 changes: 5 additions & 5 deletions
.github/workflows/build_wheels_linux_arm.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 fail-fast: false
 matrix:
 os: [ARM64]
 python-version: [3.6, 3.7, 3.8, 3.9]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
Expand All@@ -39,10 +39,11 @@ jobs:
 PLAT: aarch64
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_TEST_IMAGE: multibuild/xenial_arm64v8
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
 USE_CCACHE: 0
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
 - name: Setup Environment variables
 run: |
 if [ "ARM64" == "${{ matrix.os }}" ]; then echo "PLAT=aarch64" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: build
 run: source scripts/build.sh
Expand Down

30 changes: 17 additions & 13 deletions
.github/workflows/build_wheels_macos.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,23 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
 os: [macos-latest]
 python-version: [3.6, 3.7, 3.8, 3.9]
 os: [macos-10.15, macos-11]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
 build_sdist: [0]
 exclude:
 - os: macos-10.15
 python-version: '3.10'
 - os: macos-11
 python-version: '3.6'
 - os: macos-11
 python-version: '3.7'
 - os: macos-11
 python-version: '3.8'
 - os: macos-11
 python-version: '3.9'

 env:
 ACTIONS_ALLOW_UNSECURE_COMMANDS: true
Expand All@@ -38,9 +49,11 @@ jobs:
 TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 TRAVIS_OS_NAME: osx
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -58,22 +71,13 @@ jobs:
 if: github.event_name == 'pull_request'
 run: git submodule update --remote

 - name: Set up Python ${{ matrix.python-version }}
 uses: actions/setup-python@v2
 if: ${{ 'macos-latest' == matrix.os }}
 with:
 python-version: ${{ matrix.python-version }}
 architecture: ${{ matrix.platform }}

 - name: Setup Environment variables
 run: |
 if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
 if [ "x86" == "${{ matrix.platform }}" ]; then echo "PLAT=i686" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: before install
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/build_wheels_macos_m1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os: [macOS-M1]
python-version: [3.7, 3.8, 3.9]
python-version: ['3.7', '3.8', '3.9', '3.10']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/build_wheels_windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
platform: [x86, x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_aarch64

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_i686

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_x86_64

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

2 changes: 1 addition & 1 deletion
multibuild

Open in desktop


Submodule multibuild
updated

20 files


+17

−2

.travis.yml


+1

−1

LICENSE


+181

−28

README.rst


+94

−10

common_utils.sh


+33

−15

configure_build.sh


+3

−1

docker_build_wrap.sh


+38

−19

library_builders.sh


+9

−2

manylinux_utils.sh


+139

−13

osx_utils.sh


+11

−0

tests/test_common_utils.sh


+3

−1

tests/test_fill_pyver.sh


+10

−5

tests/test_library_builders.sh


+6

−5

tests/test_manylinux_utils_docker.sh


+8

−2

tests/test_multibuild.sh


+4

−0

tests/test_osx_utils.sh


+9

−5

tests/test_python_install.sh


+1

−1

tests/test_supported_wheels.sh


+0

−5

travis_linux_steps.sh


+14

−0

travis_osx_steps.sh


+1

−1

travis_steps.sh


7 changes: 4 additions & 3 deletions
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@
requires = [
 "setuptools", "wheel", "scikit-build", "cmake", "pip",
 "numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.19.3; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'",
 "numpy==1.21.0; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm64'",
 "numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.19.3; python_version>='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
 "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
 "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
 "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.21.2; python_version>='3.10'"
]

1 change: 0 additions & 1 deletion
scripts/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
set -x
build_wheel $REPO_DIR $PLAT
rm wheelhouse/numpy*

2 changes: 2 additions & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ def main():
 minimum_supported_numpy = "1.17.3"
 if sys.version_info[:2] >= (3, 9):
 minimum_supported_numpy = "1.19.3"
 if sys.version_info[:2] >= (3, 10):
 minimum_supported_numpy = "1.21.2"

 # linux arm64 is a special case
 if sys.platform.startswith("linux") and sys.version_info[:2] >= (3, 6) and platform.machine() == "aarch64":
Expand Down

5 changes: 4 additions & 1 deletion
travis_config.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,10 @@ function bdist_wheel_cmd {
 TOOLS_PATH=/opt/_internal/tools
 /opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
 source $TOOLS_PATH/bin/activate
 python patch_auditwheel_whitelist.py
 python$PYTHON_VERSION -m pip install auditwheel==3.2.0
 python$PYTHON_VERSION patch_auditwheel_whitelist.py
 # to avoid issues with numpy wheels
 rm /io/wheelhouse/numpy*
 deactivate
 fi
 if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi
Expand Down

2 changes: 1 addition & 1 deletion
travis_multibuild_customize.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
set -x
REPO_DIR=$(dirname "${BASH_SOURCE[0]}")
DOCKER_IMAGE='quay.io/skvark/manylinux2014_$plat'
DOCKER_IMAGE='quay.io/asenyaev/manylinux2014_$plat'

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Updated Github Actions to python 3.10 and fixed following issues#556

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

 Merged

asenyaev
merged 5 commits into

from

Oct 15, 2021
 Merged


Updated Github Actions to python 3.10 and fixed following issues
#556
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
d82a270

Updated Github Actions to python 3.10 and fixed following issues

Oct 7, 2021
0114953

Fixed the version of numpy for linux aarch64 and python3.6

Oct 8, 2021
9f43c0b

Changed the image for tests on linux arm

Oct 8, 2021
4d0f6d2

Fixed if condition for numpy test version on linux arm and renamed nu…

Oct 9, 2021
fdcbcb1

Added lowest numpy version support instead of latest

Oct 9, 2021

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


12 changes: 5 additions & 7 deletions
.github/workflows/build_wheels_linux.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 fail-fast: false
 matrix:
 os: [ubuntu-latest]
 python-version: [3.6, 3.7, 3.8, 3.9]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
Expand All@@ -38,9 +38,10 @@ jobs:
 TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: build
 run: source scripts/build.sh
Expand DownExpand Up@@ -107,7 +107,7 @@ jobs:
 NP_TEST_DEP: numpy==1.19.4
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand DownExpand Up@@ -135,8 +135,6 @@ jobs:
 run: |
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;

 - name: before install
 run: |
Expand Down

10 changes: 5 additions & 5 deletions
.github/workflows/build_wheels_linux_arm.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 fail-fast: false
 matrix:
 os: [ARM64]
 python-version: [3.6, 3.7, 3.8, 3.9]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
Expand All@@ -39,10 +39,11 @@ jobs:
 PLAT: aarch64
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_TEST_IMAGE: multibuild/xenial_arm64v8
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
 USE_CCACHE: 0
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
 - name: Setup Environment variables
 run: |
 if [ "ARM64" == "${{ matrix.os }}" ]; then echo "PLAT=aarch64" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: build
 run: source scripts/build.sh
Expand Down

30 changes: 17 additions & 13 deletions
.github/workflows/build_wheels_macos.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,23 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
 os: [macos-latest]
 python-version: [3.6, 3.7, 3.8, 3.9]
 os: [macos-10.15, macos-11]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
 build_sdist: [0]
 exclude:
 - os: macos-10.15
 python-version: '3.10'
 - os: macos-11
 python-version: '3.6'
 - os: macos-11
 python-version: '3.7'
 - os: macos-11
 python-version: '3.8'
 - os: macos-11
 python-version: '3.9'

 env:
 ACTIONS_ALLOW_UNSECURE_COMMANDS: true
Expand All@@ -38,9 +49,11 @@ jobs:
 TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 TRAVIS_OS_NAME: osx
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -58,22 +71,13 @@ jobs:
 if: github.event_name == 'pull_request'
 run: git submodule update --remote

 - name: Set up Python ${{ matrix.python-version }}
 uses: actions/setup-python@v2
 if: ${{ 'macos-latest' == matrix.os }}
 with:
 python-version: ${{ matrix.python-version }}
 architecture: ${{ matrix.platform }}

 - name: Setup Environment variables
 run: |
 if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
 if [ "x86" == "${{ matrix.platform }}" ]; then echo "PLAT=i686" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: before install
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/build_wheels_macos_m1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os: [macOS-M1]
python-version: [3.7, 3.8, 3.9]
python-version: ['3.7', '3.8', '3.9', '3.10']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/build_wheels_windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
platform: [x86, x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_aarch64

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_i686

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_x86_64

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

2 changes: 1 addition & 1 deletion
multibuild

Open in desktop


Submodule multibuild
updated

20 files


+17

−2

.travis.yml


+1

−1

LICENSE


+181

−28

README.rst


+94

−10

common_utils.sh


+33

−15

configure_build.sh


+3

−1

docker_build_wrap.sh


+38

−19

library_builders.sh


+9

−2

manylinux_utils.sh


+139

−13

osx_utils.sh


+11

−0

tests/test_common_utils.sh


+3

−1

tests/test_fill_pyver.sh


+10

−5

tests/test_library_builders.sh


+6

−5

tests/test_manylinux_utils_docker.sh


+8

−2

tests/test_multibuild.sh


+4

−0

tests/test_osx_utils.sh


+9

−5

tests/test_python_install.sh


+1

−1

tests/test_supported_wheels.sh


+0

−5

travis_linux_steps.sh


+14

−0

travis_osx_steps.sh


+1

−1

travis_steps.sh


7 changes: 4 additions & 3 deletions
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@
requires = [
 "setuptools", "wheel", "scikit-build", "cmake", "pip",
 "numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.19.3; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'",
 "numpy==1.21.0; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm64'",
 "numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.19.3; python_version>='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
 "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
 "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
 "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.21.2; python_version>='3.10'"
]

1 change: 0 additions & 1 deletion
scripts/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
set -x
build_wheel $REPO_DIR $PLAT
rm wheelhouse/numpy*

2 changes: 2 additions & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ def main():
 minimum_supported_numpy = "1.17.3"
 if sys.version_info[:2] >= (3, 9):
 minimum_supported_numpy = "1.19.3"
 if sys.version_info[:2] >= (3, 10):
 minimum_supported_numpy = "1.21.2"

 # linux arm64 is a special case
 if sys.platform.startswith("linux") and sys.version_info[:2] >= (3, 6) and platform.machine() == "aarch64":
Expand Down

5 changes: 4 additions & 1 deletion
travis_config.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,10 @@ function bdist_wheel_cmd {
 TOOLS_PATH=/opt/_internal/tools
 /opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
 source $TOOLS_PATH/bin/activate
 python patch_auditwheel_whitelist.py
 python$PYTHON_VERSION -m pip install auditwheel==3.2.0
 python$PYTHON_VERSION patch_auditwheel_whitelist.py
 # to avoid issues with numpy wheels
 rm /io/wheelhouse/numpy*
 deactivate
 fi
 if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi
Expand Down

2 changes: 1 addition & 1 deletion
travis_multibuild_customize.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
set -x
REPO_DIR=$(dirname "${BASH_SOURCE[0]}")
DOCKER_IMAGE='quay.io/skvark/manylinux2014_$plat'
DOCKER_IMAGE='quay.io/asenyaev/manylinux2014_$plat'

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Updated Github Actions to python 3.10 and fixed following issues#556

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

 Merged

asenyaev
merged 5 commits into

from

Oct 15, 2021
 Merged


Updated Github Actions to python 3.10 and fixed following issues
#556
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
d82a270

Updated Github Actions to python 3.10 and fixed following issues

Oct 7, 2021
0114953

Fixed the version of numpy for linux aarch64 and python3.6

Oct 8, 2021
9f43c0b

Changed the image for tests on linux arm

Oct 8, 2021
4d0f6d2

Fixed if condition for numpy test version on linux arm and renamed nu…

Oct 9, 2021
fdcbcb1

Added lowest numpy version support instead of latest

Oct 9, 2021

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


12 changes: 5 additions & 7 deletions
.github/workflows/build_wheels_linux.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 fail-fast: false
 matrix:
 os: [ubuntu-latest]
 python-version: [3.6, 3.7, 3.8, 3.9]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
Expand All@@ -38,9 +38,10 @@ jobs:
 TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: build
 run: source scripts/build.sh
Expand DownExpand Up@@ -107,7 +107,7 @@ jobs:
 NP_TEST_DEP: numpy==1.19.4
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand DownExpand Up@@ -135,8 +135,6 @@ jobs:
 run: |
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;

 - name: before install
 run: |
Expand Down

10 changes: 5 additions & 5 deletions
.github/workflows/build_wheels_linux_arm.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 fail-fast: false
 matrix:
 os: [ARM64]
 python-version: [3.6, 3.7, 3.8, 3.9]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
Expand All@@ -39,10 +39,11 @@ jobs:
 PLAT: aarch64
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_TEST_IMAGE: multibuild/xenial_arm64v8
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
 USE_CCACHE: 0
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
 - name: Setup Environment variables
 run: |
 if [ "ARM64" == "${{ matrix.os }}" ]; then echo "PLAT=aarch64" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: build
 run: source scripts/build.sh
Expand Down

30 changes: 17 additions & 13 deletions
.github/workflows/build_wheels_macos.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,23 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
 os: [macos-latest]
 python-version: [3.6, 3.7, 3.8, 3.9]
 os: [macos-10.15, macos-11]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
 build_sdist: [0]
 exclude:
 - os: macos-10.15
 python-version: '3.10'
 - os: macos-11
 python-version: '3.6'
 - os: macos-11
 python-version: '3.7'
 - os: macos-11
 python-version: '3.8'
 - os: macos-11
 python-version: '3.9'

 env:
 ACTIONS_ALLOW_UNSECURE_COMMANDS: true
Expand All@@ -38,9 +49,11 @@ jobs:
 TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 TRAVIS_OS_NAME: osx
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -58,22 +71,13 @@ jobs:
 if: github.event_name == 'pull_request'
 run: git submodule update --remote

 - name: Set up Python ${{ matrix.python-version }}
 uses: actions/setup-python@v2
 if: ${{ 'macos-latest' == matrix.os }}
 with:
 python-version: ${{ matrix.python-version }}
 architecture: ${{ matrix.platform }}

 - name: Setup Environment variables
 run: |
 if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
 if [ "x86" == "${{ matrix.platform }}" ]; then echo "PLAT=i686" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: before install
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/build_wheels_macos_m1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os: [macOS-M1]
python-version: [3.7, 3.8, 3.9]
python-version: ['3.7', '3.8', '3.9', '3.10']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/build_wheels_windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
platform: [x86, x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_aarch64

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_i686

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_x86_64

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

2 changes: 1 addition & 1 deletion
multibuild

Open in desktop


Submodule multibuild
updated

20 files


+17

−2

.travis.yml


+1

−1

LICENSE


+181

−28

README.rst


+94

−10

common_utils.sh


+33

−15

configure_build.sh


+3

−1

docker_build_wrap.sh


+38

−19

library_builders.sh


+9

−2

manylinux_utils.sh


+139

−13

osx_utils.sh


+11

−0

tests/test_common_utils.sh


+3

−1

tests/test_fill_pyver.sh


+10

−5

tests/test_library_builders.sh


+6

−5

tests/test_manylinux_utils_docker.sh


+8

−2

tests/test_multibuild.sh


+4

−0

tests/test_osx_utils.sh


+9

−5

tests/test_python_install.sh


+1

−1

tests/test_supported_wheels.sh


+0

−5

travis_linux_steps.sh


+14

−0

travis_osx_steps.sh


+1

−1

travis_steps.sh


7 changes: 4 additions & 3 deletions
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@
requires = [
 "setuptools", "wheel", "scikit-build", "cmake", "pip",
 "numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.19.3; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'",
 "numpy==1.21.0; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm64'",
 "numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.19.3; python_version>='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
 "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
 "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
 "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.21.2; python_version>='3.10'"
]

1 change: 0 additions & 1 deletion
scripts/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
set -x
build_wheel $REPO_DIR $PLAT
rm wheelhouse/numpy*

2 changes: 2 additions & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ def main():
 minimum_supported_numpy = "1.17.3"
 if sys.version_info[:2] >= (3, 9):
 minimum_supported_numpy = "1.19.3"
 if sys.version_info[:2] >= (3, 10):
 minimum_supported_numpy = "1.21.2"

 # linux arm64 is a special case
 if sys.platform.startswith("linux") and sys.version_info[:2] >= (3, 6) and platform.machine() == "aarch64":
Expand Down

5 changes: 4 additions & 1 deletion
travis_config.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,10 @@ function bdist_wheel_cmd {
 TOOLS_PATH=/opt/_internal/tools
 /opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
 source $TOOLS_PATH/bin/activate
 python patch_auditwheel_whitelist.py
 python$PYTHON_VERSION -m pip install auditwheel==3.2.0
 python$PYTHON_VERSION patch_auditwheel_whitelist.py
 # to avoid issues with numpy wheels
 rm /io/wheelhouse/numpy*
 deactivate
 fi
 if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi
Expand Down

2 changes: 1 addition & 1 deletion
travis_multibuild_customize.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
set -x
REPO_DIR=$(dirname "${BASH_SOURCE[0]}")
DOCKER_IMAGE='quay.io/skvark/manylinux2014_$plat'
DOCKER_IMAGE='quay.io/asenyaev/manylinux2014_$plat'

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Updated Github Actions to python 3.10 and fixed following issues#556

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

 Merged

asenyaev
merged 5 commits into

from

Oct 15, 2021
 Merged


Updated Github Actions to python 3.10 and fixed following issues
#556
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
d82a270

Updated Github Actions to python 3.10 and fixed following issues

Oct 7, 2021
0114953

Fixed the version of numpy for linux aarch64 and python3.6

Oct 8, 2021
9f43c0b

Changed the image for tests on linux arm

Oct 8, 2021
4d0f6d2

Fixed if condition for numpy test version on linux arm and renamed nu…

Oct 9, 2021
fdcbcb1

Added lowest numpy version support instead of latest

Oct 9, 2021

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


12 changes: 5 additions & 7 deletions
.github/workflows/build_wheels_linux.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 fail-fast: false
 matrix:
 os: [ubuntu-latest]
 python-version: [3.6, 3.7, 3.8, 3.9]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
Expand All@@ -38,9 +38,10 @@ jobs:
 TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: build
 run: source scripts/build.sh
Expand DownExpand Up@@ -107,7 +107,7 @@ jobs:
 NP_TEST_DEP: numpy==1.19.4
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand DownExpand Up@@ -135,8 +135,6 @@ jobs:
 run: |
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;

 - name: before install
 run: |
Expand Down

10 changes: 5 additions & 5 deletions
.github/workflows/build_wheels_linux_arm.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 fail-fast: false
 matrix:
 os: [ARM64]
 python-version: [3.6, 3.7, 3.8, 3.9]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
Expand All@@ -39,10 +39,11 @@ jobs:
 PLAT: aarch64
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_TEST_IMAGE: multibuild/xenial_arm64v8
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
 USE_CCACHE: 0
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
 - name: Setup Environment variables
 run: |
 if [ "ARM64" == "${{ matrix.os }}" ]; then echo "PLAT=aarch64" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: build
 run: source scripts/build.sh
Expand Down

30 changes: 17 additions & 13 deletions
.github/workflows/build_wheels_macos.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,23 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
 os: [macos-latest]
 python-version: [3.6, 3.7, 3.8, 3.9]
 os: [macos-10.15, macos-11]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
 build_sdist: [0]
 exclude:
 - os: macos-10.15
 python-version: '3.10'
 - os: macos-11
 python-version: '3.6'
 - os: macos-11
 python-version: '3.7'
 - os: macos-11
 python-version: '3.8'
 - os: macos-11
 python-version: '3.9'

 env:
 ACTIONS_ALLOW_UNSECURE_COMMANDS: true
Expand All@@ -38,9 +49,11 @@ jobs:
 TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 TRAVIS_OS_NAME: osx
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -58,22 +71,13 @@ jobs:
 if: github.event_name == 'pull_request'
 run: git submodule update --remote

 - name: Set up Python ${{ matrix.python-version }}
 uses: actions/setup-python@v2
 if: ${{ 'macos-latest' == matrix.os }}
 with:
 python-version: ${{ matrix.python-version }}
 architecture: ${{ matrix.platform }}

 - name: Setup Environment variables
 run: |
 if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
 if [ "x86" == "${{ matrix.platform }}" ]; then echo "PLAT=i686" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: before install
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/build_wheels_macos_m1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os: [macOS-M1]
python-version: [3.7, 3.8, 3.9]
python-version: ['3.7', '3.8', '3.9', '3.10']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/build_wheels_windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
platform: [x86, x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_aarch64

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_i686

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_x86_64

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

2 changes: 1 addition & 1 deletion
multibuild

Open in desktop


Submodule multibuild
updated

20 files


+17

−2

.travis.yml


+1

−1

LICENSE


+181

−28

README.rst


+94

−10

common_utils.sh


+33

−15

configure_build.sh


+3

−1

docker_build_wrap.sh


+38

−19

library_builders.sh


+9

−2

manylinux_utils.sh


+139

−13

osx_utils.sh


+11

−0

tests/test_common_utils.sh


+3

−1

tests/test_fill_pyver.sh


+10

−5

tests/test_library_builders.sh


+6

−5

tests/test_manylinux_utils_docker.sh


+8

−2

tests/test_multibuild.sh


+4

−0

tests/test_osx_utils.sh


+9

−5

tests/test_python_install.sh


+1

−1

tests/test_supported_wheels.sh


+0

−5

travis_linux_steps.sh


+14

−0

travis_osx_steps.sh


+1

−1

travis_steps.sh


7 changes: 4 additions & 3 deletions
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@
requires = [
 "setuptools", "wheel", "scikit-build", "cmake", "pip",
 "numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.19.3; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'",
 "numpy==1.21.0; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm64'",
 "numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.19.3; python_version>='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
 "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
 "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
 "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.21.2; python_version>='3.10'"
]

1 change: 0 additions & 1 deletion
scripts/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
set -x
build_wheel $REPO_DIR $PLAT
rm wheelhouse/numpy*

2 changes: 2 additions & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ def main():
 minimum_supported_numpy = "1.17.3"
 if sys.version_info[:2] >= (3, 9):
 minimum_supported_numpy = "1.19.3"
 if sys.version_info[:2] >= (3, 10):
 minimum_supported_numpy = "1.21.2"

 # linux arm64 is a special case
 if sys.platform.startswith("linux") and sys.version_info[:2] >= (3, 6) and platform.machine() == "aarch64":
Expand Down

5 changes: 4 additions & 1 deletion
travis_config.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,10 @@ function bdist_wheel_cmd {
 TOOLS_PATH=/opt/_internal/tools
 /opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
 source $TOOLS_PATH/bin/activate
 python patch_auditwheel_whitelist.py
 python$PYTHON_VERSION -m pip install auditwheel==3.2.0
 python$PYTHON_VERSION patch_auditwheel_whitelist.py
 # to avoid issues with numpy wheels
 rm /io/wheelhouse/numpy*
 deactivate
 fi
 if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi
Expand Down

2 changes: 1 addition & 1 deletion
travis_multibuild_customize.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
set -x
REPO_DIR=$(dirname "${BASH_SOURCE[0]}")
DOCKER_IMAGE='quay.io/skvark/manylinux2014_$plat'
DOCKER_IMAGE='quay.io/asenyaev/manylinux2014_$plat'

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Updated Github Actions to python 3.10 and fixed following issues#556

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

 Merged

asenyaev
merged 5 commits into

from

Oct 15, 2021
 Merged


Updated Github Actions to python 3.10 and fixed following issues
#556
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
d82a270

Updated Github Actions to python 3.10 and fixed following issues

Oct 7, 2021
0114953

Fixed the version of numpy for linux aarch64 and python3.6

Oct 8, 2021
9f43c0b

Changed the image for tests on linux arm

Oct 8, 2021
4d0f6d2

Fixed if condition for numpy test version on linux arm and renamed nu…

Oct 9, 2021
fdcbcb1

Added lowest numpy version support instead of latest

Oct 9, 2021

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


12 changes: 5 additions & 7 deletions
.github/workflows/build_wheels_linux.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 fail-fast: false
 matrix:
 os: [ubuntu-latest]
 python-version: [3.6, 3.7, 3.8, 3.9]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
Expand All@@ -38,9 +38,10 @@ jobs:
 TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: build
 run: source scripts/build.sh
Expand DownExpand Up@@ -107,7 +107,7 @@ jobs:
 NP_TEST_DEP: numpy==1.19.4
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand DownExpand Up@@ -135,8 +135,6 @@ jobs:
 run: |
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;

 - name: before install
 run: |
Expand Down

10 changes: 5 additions & 5 deletions
.github/workflows/build_wheels_linux_arm.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 fail-fast: false
 matrix:
 os: [ARM64]
 python-version: [3.6, 3.7, 3.8, 3.9]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
Expand All@@ -39,10 +39,11 @@ jobs:
 PLAT: aarch64
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_TEST_IMAGE: multibuild/xenial_arm64v8
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
 USE_CCACHE: 0
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
 - name: Setup Environment variables
 run: |
 if [ "ARM64" == "${{ matrix.os }}" ]; then echo "PLAT=aarch64" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: build
 run: source scripts/build.sh
Expand Down

30 changes: 17 additions & 13 deletions
.github/workflows/build_wheels_macos.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,23 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
 os: [macos-latest]
 python-version: [3.6, 3.7, 3.8, 3.9]
 os: [macos-10.15, macos-11]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
 build_sdist: [0]
 exclude:
 - os: macos-10.15
 python-version: '3.10'
 - os: macos-11
 python-version: '3.6'
 - os: macos-11
 python-version: '3.7'
 - os: macos-11
 python-version: '3.8'
 - os: macos-11
 python-version: '3.9'

 env:
 ACTIONS_ALLOW_UNSECURE_COMMANDS: true
Expand All@@ -38,9 +49,11 @@ jobs:
 TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 TRAVIS_OS_NAME: osx
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -58,22 +71,13 @@ jobs:
 if: github.event_name == 'pull_request'
 run: git submodule update --remote

 - name: Set up Python ${{ matrix.python-version }}
 uses: actions/setup-python@v2
 if: ${{ 'macos-latest' == matrix.os }}
 with:
 python-version: ${{ matrix.python-version }}
 architecture: ${{ matrix.platform }}

 - name: Setup Environment variables
 run: |
 if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
 if [ "x86" == "${{ matrix.platform }}" ]; then echo "PLAT=i686" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: before install
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/build_wheels_macos_m1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os: [macOS-M1]
python-version: [3.7, 3.8, 3.9]
python-version: ['3.7', '3.8', '3.9', '3.10']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/build_wheels_windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
platform: [x86, x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_aarch64

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_i686

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_x86_64

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

2 changes: 1 addition & 1 deletion
multibuild

Open in desktop


Submodule multibuild
updated

20 files


+17

−2

.travis.yml


+1

−1

LICENSE


+181

−28

README.rst


+94

−10

common_utils.sh


+33

−15

configure_build.sh


+3

−1

docker_build_wrap.sh


+38

−19

library_builders.sh


+9

−2

manylinux_utils.sh


+139

−13

osx_utils.sh


+11

−0

tests/test_common_utils.sh


+3

−1

tests/test_fill_pyver.sh


+10

−5

tests/test_library_builders.sh


+6

−5

tests/test_manylinux_utils_docker.sh


+8

−2

tests/test_multibuild.sh


+4

−0

tests/test_osx_utils.sh


+9

−5

tests/test_python_install.sh


+1

−1

tests/test_supported_wheels.sh


+0

−5

travis_linux_steps.sh


+14

−0

travis_osx_steps.sh


+1

−1

travis_steps.sh


7 changes: 4 additions & 3 deletions
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@
requires = [
 "setuptools", "wheel", "scikit-build", "cmake", "pip",
 "numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.19.3; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'",
 "numpy==1.21.0; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm64'",
 "numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.19.3; python_version>='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
 "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
 "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
 "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.21.2; python_version>='3.10'"
]

1 change: 0 additions & 1 deletion
scripts/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
set -x
build_wheel $REPO_DIR $PLAT
rm wheelhouse/numpy*

2 changes: 2 additions & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ def main():
 minimum_supported_numpy = "1.17.3"
 if sys.version_info[:2] >= (3, 9):
 minimum_supported_numpy = "1.19.3"
 if sys.version_info[:2] >= (3, 10):
 minimum_supported_numpy = "1.21.2"

 # linux arm64 is a special case
 if sys.platform.startswith("linux") and sys.version_info[:2] >= (3, 6) and platform.machine() == "aarch64":
Expand Down

5 changes: 4 additions & 1 deletion
travis_config.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,10 @@ function bdist_wheel_cmd {
 TOOLS_PATH=/opt/_internal/tools
 /opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
 source $TOOLS_PATH/bin/activate
 python patch_auditwheel_whitelist.py
 python$PYTHON_VERSION -m pip install auditwheel==3.2.0
 python$PYTHON_VERSION patch_auditwheel_whitelist.py
 # to avoid issues with numpy wheels
 rm /io/wheelhouse/numpy*
 deactivate
 fi
 if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi
Expand Down

2 changes: 1 addition & 1 deletion
travis_multibuild_customize.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
set -x
REPO_DIR=$(dirname "${BASH_SOURCE[0]}")
DOCKER_IMAGE='quay.io/skvark/manylinux2014_$plat'
DOCKER_IMAGE='quay.io/asenyaev/manylinux2014_$plat'

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Updated Github Actions to python 3.10 and fixed following issues#556

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

 Merged

asenyaev
merged 5 commits into

from

Oct 15, 2021
 Merged


Updated Github Actions to python 3.10 and fixed following issues
#556
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
d82a270

Updated Github Actions to python 3.10 and fixed following issues

Oct 7, 2021
0114953

Fixed the version of numpy for linux aarch64 and python3.6

Oct 8, 2021
9f43c0b

Changed the image for tests on linux arm

Oct 8, 2021
4d0f6d2

Fixed if condition for numpy test version on linux arm and renamed nu…

Oct 9, 2021
fdcbcb1

Added lowest numpy version support instead of latest

Oct 9, 2021

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


12 changes: 5 additions & 7 deletions
.github/workflows/build_wheels_linux.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 fail-fast: false
 matrix:
 os: [ubuntu-latest]
 python-version: [3.6, 3.7, 3.8, 3.9]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
Expand All@@ -38,9 +38,10 @@ jobs:
 TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: build
 run: source scripts/build.sh
Expand DownExpand Up@@ -107,7 +107,7 @@ jobs:
 NP_TEST_DEP: numpy==1.19.4
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand DownExpand Up@@ -135,8 +135,6 @@ jobs:
 run: |
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;

 - name: before install
 run: |
Expand Down

10 changes: 5 additions & 5 deletions
.github/workflows/build_wheels_linux_arm.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 fail-fast: false
 matrix:
 os: [ARM64]
 python-version: [3.6, 3.7, 3.8, 3.9]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
Expand All@@ -39,10 +39,11 @@ jobs:
 PLAT: aarch64
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_TEST_IMAGE: multibuild/xenial_arm64v8
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
 USE_CCACHE: 0
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -63,8 +64,7 @@ jobs:
 - name: Setup Environment variables
 run: |
 if [ "ARM64" == "${{ matrix.os }}" ]; then echo "PLAT=aarch64" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: build
 run: source scripts/build.sh
Expand Down

30 changes: 17 additions & 13 deletions
.github/workflows/build_wheels_macos.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,23 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
 os: [macos-latest]
 python-version: [3.6, 3.7, 3.8, 3.9]
 os: [macos-10.15, macos-11]
 python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 platform: [x64]
 with_contrib: [0, 1]
 without_gui: [0, 1]
 build_sdist: [0]
 exclude:
 - os: macos-10.15
 python-version: '3.10'
 - os: macos-11
 python-version: '3.6'
 - os: macos-11
 python-version: '3.7'
 - os: macos-11
 python-version: '3.8'
 - os: macos-11
 python-version: '3.9'

 env:
 ACTIONS_ALLOW_UNSECURE_COMMANDS: true
Expand All@@ -38,9 +49,11 @@ jobs:
 TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
 MB_ML_VER: 2014
 NP_TEST_DEP: numpy==1.19.4
 NP_TEST_DEP_LATEST: numpy==1.21.2
 TRAVIS_BUILD_DIR: ${{ github.workspace }}
 TRAVIS_OS_NAME: osx
 CONFIG_PATH: travis_config.sh
 DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
 DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
 USE_CCACHE: 1
 UNICODE_WIDTH: 32
 SDIST: ${{ matrix.build_sdist || 0 }}
Expand All@@ -58,22 +71,13 @@ jobs:
 if: github.event_name == 'pull_request'
 run: git submodule update --remote

 - name: Set up Python ${{ matrix.python-version }}
 uses: actions/setup-python@v2
 if: ${{ 'macos-latest' == matrix.os }}
 with:
 python-version: ${{ matrix.python-version }}
 architecture: ${{ matrix.platform }}

 - name: Setup Environment variables
 run: |
 if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
 if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
 if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
 if [ "x86" == "${{ matrix.platform }}" ]; then echo "PLAT=i686" >> $GITHUB_ENV; fi
 echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
 echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
 if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi

 - name: before install
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/build_wheels_macos_m1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os: [macOS-M1]
python-version: [3.7, 3.8, 3.9]
python-version: ['3.7', '3.8', '3.9', '3.10']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/build_wheels_windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
platform: [x86, x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_aarch64

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_i686

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

10 changes: 5 additions & 5 deletions
docker/manylinux2014/Dockerfile_x86_64

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,8 @@ RUN mkdir ~/ffmpeg_sources && \
 rm -rf ~/openssl_build

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

RUN cd ~/ffmpeg_sources && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
 tar -xf ffmpeg-snapshot.tar.bz2 && \
 cd ffmpeg && \
 curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
 tar -xf ffmpeg-4.3.2.tar.bz2 && \
 cd ffmpeg-4.3.2 && \
 PATH=~/bin:$PATH && \
 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" && \
 make -j$(getconf _NPROCESSORS_ONLN) && \
Expand Down

2 changes: 1 addition & 1 deletion
multibuild

Open in desktop


Submodule multibuild
updated

20 files


+17

−2

.travis.yml


+1

−1

LICENSE


+181

−28

README.rst


+94

−10

common_utils.sh


+33

−15

configure_build.sh


+3

−1

docker_build_wrap.sh


+38

−19

library_builders.sh


+9

−2

manylinux_utils.sh


+139

−13

osx_utils.sh


+11

−0

tests/test_common_utils.sh


+3

−1

tests/test_fill_pyver.sh


+10

−5

tests/test_library_builders.sh


+6

−5

tests/test_manylinux_utils_docker.sh


+8

−2

tests/test_multibuild.sh


+4

−0

tests/test_osx_utils.sh


+9

−5

tests/test_python_install.sh


+1

−1

tests/test_supported_wheels.sh


+0

−5

travis_linux_steps.sh


+14

−0

travis_osx_steps.sh


+1

−1

travis_steps.sh


7 changes: 4 additions & 3 deletions
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@
requires = [
 "setuptools", "wheel", "scikit-build", "cmake", "pip",
 "numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.19.3; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'",
 "numpy==1.21.0; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm64'",
 "numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.19.3; python_version>='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'"
 "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
 "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
 "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
 "numpy==1.21.2; python_version>='3.10'"
]

1 change: 0 additions & 1 deletion
scripts/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
set -x
build_wheel $REPO_DIR $PLAT
rm wheelhouse/numpy*

2 changes: 2 additions & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ def main():
 minimum_supported_numpy = "1.17.3"
 if sys.version_info[:2] >= (3, 9):
 minimum_supported_numpy = "1.19.3"
 if sys.version_info[:2] >= (3, 10):
 minimum_supported_numpy = "1.21.2"

 # linux arm64 is a special case
 if sys.platform.startswith("linux") and sys.version_info[:2] >= (3, 6) and platform.machine() == "aarch64":
Expand Down

5 changes: 4 additions & 1 deletion
travis_config.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,10 @@ function bdist_wheel_cmd {
 TOOLS_PATH=/opt/_internal/tools
 /opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
 source $TOOLS_PATH/bin/activate
 python patch_auditwheel_whitelist.py
 python$PYTHON_VERSION -m pip install auditwheel==3.2.0
 python$PYTHON_VERSION patch_auditwheel_whitelist.py
 # to avoid issues with numpy wheels
 rm /io/wheelhouse/numpy*
 deactivate
 fi
 if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi
Expand Down

2 changes: 1 addition & 1 deletion
travis_multibuild_customize.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
set -x
REPO_DIR=$(dirname "${BASH_SOURCE[0]}")
DOCKER_IMAGE='quay.io/skvark/manylinux2014_$plat'
DOCKER_IMAGE='quay.io/asenyaev/manylinux2014_$plat'