From cad39cebe28ad723df5660c106ba3a664863e9b8 Mon Sep 17 00:00:00 2001 From: Dima Boger Date: Sat, 20 Mar 2021 11:09:25 +0300 Subject: [PATCH 01/10] Add 3.9 to release matrix --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2a15645..64c035f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -70,7 +70,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.5, 3.6, 3.7, 3.8] + python-version: [3.5, 3.6, 3.7, 3.8, 3.9] os: [ubuntu-16.04, macos-latest, windows-latest] exclude: # Python 3.5 is unable to properly From 1480f1789d62dbe415c8f010757aa05c818b8f09 Mon Sep 17 00:00:00 2001 From: Dima Boger Date: Sat, 20 Mar 2021 11:09:53 +0300 Subject: [PATCH 02/10] Add 3.9 to the test matrix --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5e989a5..0658db1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.5, 3.6, 3.7, 3.8] + python-version: [3.5, 3.6, 3.7, 3.8, 3.9] os: [windows-latest, ubuntu-18.04, macos-latest] exclude: # Python 3.5 is unable to properly From 2c344eebbd415bdacd6703aa4a3f53234b1b0d82 Mon Sep 17 00:00:00 2001 From: Dima Boger Date: Sat, 20 Mar 2021 11:28:41 +0300 Subject: [PATCH 03/10] Check random things to fix the build problem which I don't understand --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0658db1..15a2a6c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,6 +16,7 @@ jobs: max-parallel: 4 matrix: python-version: [3.5, 3.6, 3.7, 3.8, 3.9] + architecture: ['x64'] os: [windows-latest, ubuntu-18.04, macos-latest] exclude: # Python 3.5 is unable to properly @@ -45,7 +46,7 @@ jobs: if: steps.release.outputs.version == 0 with: python-version: ${{ matrix.python-version }} - + - name: Test if: steps.release.outputs.version == 0 run: | From 1b964710b6daaea2ceeedb5a89af2608fb4f5f82 Mon Sep 17 00:00:00 2001 From: Dima Boger Date: Sat, 20 Mar 2021 11:35:18 +0300 Subject: [PATCH 04/10] Revert changes --- .github/workflows/tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 15a2a6c..0658db1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,6 @@ jobs: max-parallel: 4 matrix: python-version: [3.5, 3.6, 3.7, 3.8, 3.9] - architecture: ['x64'] os: [windows-latest, ubuntu-18.04, macos-latest] exclude: # Python 3.5 is unable to properly @@ -46,7 +45,7 @@ jobs: if: steps.release.outputs.version == 0 with: python-version: ${{ matrix.python-version }} - + - name: Test if: steps.release.outputs.version == 0 run: | From 3d63718ffee6a71004734987feb60f1eceb6ae06 Mon Sep 17 00:00:00 2001 From: Dima Boger Date: Sat, 20 Mar 2021 11:36:00 +0300 Subject: [PATCH 05/10] Cython Update: Check random things to fix the build problem which I don't understand --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ee6bd7d..0c4b96c 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ ROOT = pathlib.Path(__file__).parent -CYTHON_DEPENDENCY = 'Cython==0.29.14' +CYTHON_DEPENDENCY = 'Cython==0.29.22' class httptools_build_ext(build_ext): From 7cdbafe1eac496efc3f8c347059c357847eed092 Mon Sep 17 00:00:00 2001 From: Dima Boger Date: Sat, 20 Mar 2021 11:47:10 +0300 Subject: [PATCH 06/10] Add few build step to test flow for testing --- .github/workflows/tests.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0658db1..f74f30e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -51,3 +51,30 @@ jobs: run: | pip install -e .[test] python setup.py test + + # revert this after testing + - name: Install Python Deps + run: | + python -m pip install --upgrade setuptools pip wheel + + - name: Build Wheels (linux) + if: startsWith(matrix.os, 'ubuntu') + uses: docker://quay.io/pypa/manylinux1_x86_64 + env: + PYTHON_VERSION: ${{ matrix.python-version }} + with: + entrypoint: /github/workspace/.github/workflows/build-manylinux-wheels.sh + + - name: Build Wheels (non-linux) + if: "!startsWith(matrix.os, 'ubuntu')" + run: | + make clean + python setup.py bdist_wheel + + - name: Test Wheels + if: | + !startsWith(matrix.os, 'windows') + && !contains(github.event.pull_request.labels.*.name, 'skip wheel tests') + run: | + pip install --pre httptools -f "file:///${GITHUB_WORKSPACE}/dist" + make -C "${GITHUB_WORKSPACE}" testinstalled From 6728d9cae38ce7b86fe32fc999955f5e06af430a Mon Sep 17 00:00:00 2001 From: Dima Boger Date: Sat, 20 Mar 2021 11:52:50 +0300 Subject: [PATCH 07/10] Oh-uh, Looks like cython 0.29.22 doesn't support 3.5? --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0c4b96c..ee6bd7d 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ ROOT = pathlib.Path(__file__).parent -CYTHON_DEPENDENCY = 'Cython==0.29.22' +CYTHON_DEPENDENCY = 'Cython==0.29.14' class httptools_build_ext(build_ext): From e5aaec67adb55eb78932ea15a7b56b2119a093c6 Mon Sep 17 00:00:00 2001 From: Dima Boger Date: Sat, 20 Mar 2021 12:12:36 +0300 Subject: [PATCH 08/10] Nah, I think problem in 3.5 manylinux, let's isolate that --- .github/workflows/tests.yml | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f74f30e..db5f392 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -52,11 +52,34 @@ jobs: pip install -e .[test] python setup.py test - # revert this after testing + # revert this after testing + build-wheels: + runs-on: ${{ matrix.os }} + strategy: + matrix: + python-version: [3.5, 3.6, 3.7, 3.8] + os: [ubuntu-16.04, macos-latest, windows-latest] + exclude: + # Python 3.5 is unable to properly + # find the recent VS tooling + # https://bugs.python.org/issue30389 + - os: windows-latest + python-version: 3.5 + + steps: + - uses: actions/checkout@v1 + with: + fetch-depth: 50 + submodules: true + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - name: Install Python Deps run: | python -m pip install --upgrade setuptools pip wheel - - name: Build Wheels (linux) if: startsWith(matrix.os, 'ubuntu') uses: docker://quay.io/pypa/manylinux1_x86_64 @@ -70,7 +93,6 @@ jobs: run: | make clean python setup.py bdist_wheel - - name: Test Wheels if: | !startsWith(matrix.os, 'windows') From dd99e76694d82b40a8eacf68c073431e59663a8a Mon Sep 17 00:00:00 2001 From: Dima Boger Date: Sat, 20 Mar 2021 09:20:40 +0000 Subject: [PATCH 09/10] Combine all in one place --- .github/workflows/tests.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index db5f392..26d1a99 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -57,7 +57,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.5, 3.6, 3.7, 3.8] + python-version: [3.5, 3.6, 3.7, 3.8, 3.9] os: [ubuntu-16.04, macos-latest, windows-latest] exclude: # Python 3.5 is unable to properly diff --git a/setup.py b/setup.py index ee6bd7d..0c4b96c 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ ROOT = pathlib.Path(__file__).parent -CYTHON_DEPENDENCY = 'Cython==0.29.14' +CYTHON_DEPENDENCY = 'Cython==0.29.22' class httptools_build_ext(build_ext): From 59e21a271b5e7405cd9d4b7c2ffa3e9f98b2d98f Mon Sep 17 00:00:00 2001 From: Dima Boger Date: Sat, 20 Mar 2021 12:52:27 +0300 Subject: [PATCH 10/10] Ready to merge I think --- .github/workflows/tests.yml | 49 ------------------------------------- 1 file changed, 49 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 26d1a99..0658db1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -51,52 +51,3 @@ jobs: run: | pip install -e .[test] python setup.py test - - # revert this after testing - build-wheels: - runs-on: ${{ matrix.os }} - strategy: - matrix: - python-version: [3.5, 3.6, 3.7, 3.8, 3.9] - os: [ubuntu-16.04, macos-latest, windows-latest] - exclude: - # Python 3.5 is unable to properly - # find the recent VS tooling - # https://bugs.python.org/issue30389 - - os: windows-latest - python-version: 3.5 - - steps: - - uses: actions/checkout@v1 - with: - fetch-depth: 50 - submodules: true - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - - name: Install Python Deps - run: | - python -m pip install --upgrade setuptools pip wheel - - name: Build Wheels (linux) - if: startsWith(matrix.os, 'ubuntu') - uses: docker://quay.io/pypa/manylinux1_x86_64 - env: - PYTHON_VERSION: ${{ matrix.python-version }} - with: - entrypoint: /github/workspace/.github/workflows/build-manylinux-wheels.sh - - - name: Build Wheels (non-linux) - if: "!startsWith(matrix.os, 'ubuntu')" - run: | - make clean - python setup.py bdist_wheel - - name: Test Wheels - if: | - !startsWith(matrix.os, 'windows') - && !contains(github.event.pull_request.labels.*.name, 'skip wheel tests') - run: | - pip install --pre httptools -f "file:///${GITHUB_WORKSPACE}/dist" - make -C "${GITHUB_WORKSPACE}" testinstalled