From c3003c88d747324e904de025c8efe497e647d0c3 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 10 Jul 2022 08:41:52 +0200 Subject: [PATCH 01/15] Upgrade GitHub Actions and add Python 3.10 --- .github/workflows/CI.yml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index bc0030343..d2e5010ad 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -9,10 +9,10 @@ jobs: runs-on: macos-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: ["3.7", "3.8", "3.9", "3.10"] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install Rust toolchain @@ -40,7 +40,7 @@ jobs: pip install --force-reinstall dist/robyn*_universal2.whl cd ~ && python -c 'import robyn' - name: Upload wheels - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: wheels path: dist @@ -49,11 +49,11 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: ["3.7", "3.8", "3.9", "3.10"] target: [x64, x86] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} architecture: ${{ matrix.target }} @@ -74,7 +74,7 @@ jobs: pip install --force-reinstall dist/robyn*.whl cd ~ && python -c 'import robyn' - name: Upload wheels - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: wheels path: dist @@ -83,17 +83,17 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: ["3.7", "3.8", "3.9", "3.10"] target: [x86_64, i686] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: toolchain: stable profile: minimal default: true - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Build Wheels @@ -108,7 +108,7 @@ jobs: pip install --force-reinstall dist/robyn*.whl cd ~ && python -c 'import robyn' - name: Upload wheels - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: wheels path: dist @@ -122,10 +122,11 @@ jobs: { version: "3.7", abi: "cp37-cp37m" }, { version: "3.8", abi: "cp38-cp38" }, { version: "3.9", abi: "cp39-cp39" }, + { version: "3.10", abi: "cp310-cp310" }, ] target: [aarch64, armv7, s390x, ppc64le] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Build Wheels uses: messense/maturin-action@v1 env: @@ -134,7 +135,7 @@ jobs: target: ${{ matrix.target }} manylinux: auto args: -i python3.9 --release --out dist --no-sdist - - uses: uraimo/run-on-arch-action@v2.0.5 + - uses: uraimo/run-on-arch-action@v2.2.0 name: Install built wheel with: arch: ${{ matrix.target }} @@ -157,7 +158,7 @@ jobs: $PYTHON -m pip install --force-reinstall dist/robyn*.whl cd ~ && $PYTHON -c 'import robyn' - name: Upload wheels - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: wheels path: dist @@ -168,10 +169,10 @@ jobs: if: "startsWith(github.ref, 'refs/tags/')" needs: [macos, windows, linux, linux-cross] steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: wheels - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: 3.9 - name: Publish to PyPi From 15700251ac96c6f453e78716695cb5133da11997 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 12 Jul 2022 13:35:53 +0200 Subject: [PATCH 02/15] linux-cross is not ready for Python 3.10 --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d2e5010ad..b4816f8b6 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -122,7 +122,7 @@ jobs: { version: "3.7", abi: "cp37-cp37m" }, { version: "3.8", abi: "cp38-cp38" }, { version: "3.9", abi: "cp39-cp39" }, - { version: "3.10", abi: "cp310-cp310" }, + # { version: "3.10", abi: "cp310-cp310" }, ] target: [aarch64, armv7, s390x, ppc64le] steps: From 7752ba6fd082fa51fbd22fdfaa4312143784fe3f Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 13 Jul 2022 09:18:18 +0200 Subject: [PATCH 03/15] linux-cross: Install desired Python in container --- .github/workflows/CI.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b4816f8b6..42fe30a34 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -122,7 +122,7 @@ jobs: { version: "3.7", abi: "cp37-cp37m" }, { version: "3.8", abi: "cp38-cp38" }, { version: "3.9", abi: "cp39-cp39" }, - # { version: "3.10", abi: "cp310-cp310" }, + { version: "3.10", abi: "cp310-cp310" }, ] target: [aarch64, armv7, s390x, ppc64le] steps: @@ -149,8 +149,7 @@ jobs: apt-get install -y --no-install-recommends python3 python3-pip software-properties-common add-apt-repository ppa:deadsnakes/ppa apt-get update -y - apt-get install -y python3.7-distutils python3.9-distutils - apt-get install -y python3.7 python3.9 + apt-get install -y python${{ matrix.python.version }} python${{ matrix.python.version }}-distutils run: | ls -lrth /artifacts PYTHON=python${{ matrix.python.version }} From da9bc5115dd4e4af16be093c3d3a71bc54ef6449 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 13 Jul 2022 09:43:09 +0200 Subject: [PATCH 04/15] html5lib --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 42fe30a34..ee66a26c5 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -153,7 +153,7 @@ jobs: run: | ls -lrth /artifacts PYTHON=python${{ matrix.python.version }} - $PYTHON -m pip install -U pip + $PYTHON -m pip install --upgrade pip html5lib $PYTHON -m pip install --force-reinstall dist/robyn*.whl cd ~ && $PYTHON -c 'import robyn' - name: Upload wheels @@ -173,7 +173,7 @@ jobs: name: wheels - uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.10 - name: Publish to PyPi env: TWINE_USERNAME: __token__ From 5354896086160fc97446207409a85729afd8aafe Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 13 Jul 2022 10:09:36 +0200 Subject: [PATCH 05/15] fail-fast: false --- .github/workflows/CI.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ee66a26c5..295aa3849 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -116,6 +116,7 @@ jobs: linux-cross: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: python: [ @@ -145,14 +146,15 @@ jobs: dockerRunArgs: | --volume "${PWD}/dist:/artifacts" install: | - apt-get update - apt-get install -y --no-install-recommends python3 python3-pip software-properties-common + PYTHON=python${{ matrix.python.version }} add-apt-repository ppa:deadsnakes/ppa apt-get update -y - apt-get install -y python${{ matrix.python.version }} python${{ matrix.python.version }}-distutils + apt-get install -y --no-install-recommends software-properties-common + apt-get install -y $PYTHON $PYTHON-distutils $PYTHON-pip run: | ls -lrth /artifacts PYTHON=python${{ matrix.python.version }} + $PYTHON --version $PYTHON -m pip install --upgrade pip html5lib $PYTHON -m pip install --force-reinstall dist/robyn*.whl cd ~ && $PYTHON -c 'import robyn' From 44a0c627251c48eecf468b95b92f0e2a9719ede1 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 13 Jul 2022 10:32:31 +0200 Subject: [PATCH 06/15] Update CI.yml --- .github/workflows/CI.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 295aa3849..05071cb90 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -147,9 +147,10 @@ jobs: --volume "${PWD}/dist:/artifacts" install: | PYTHON=python${{ matrix.python.version }} - add-apt-repository ppa:deadsnakes/ppa apt-get update -y apt-get install -y --no-install-recommends software-properties-common + add-apt-repository ppa:deadsnakes/ppa + apt-get update -y apt-get install -y $PYTHON $PYTHON-distutils $PYTHON-pip run: | ls -lrth /artifacts From ef9a477c5d5b0cbac208411d01f67bcef41b99cd Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 13 Jul 2022 10:44:05 +0200 Subject: [PATCH 07/15] apt-get install -y $PYTHON $PYTHON-distutils --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 05071cb90..2552ce4e9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -151,7 +151,7 @@ jobs: apt-get install -y --no-install-recommends software-properties-common add-apt-repository ppa:deadsnakes/ppa apt-get update -y - apt-get install -y $PYTHON $PYTHON-distutils $PYTHON-pip + apt-get install -y $PYTHON $PYTHON-distutils run: | ls -lrth /artifacts PYTHON=python${{ matrix.python.version }} From 015631f314f6678a567ae9e6491ce74800a657d6 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 13 Jul 2022 11:07:12 +0200 Subject: [PATCH 08/15] apt-get install -y $PYTHON $PYTHON-distutils $PYTHON-venv --- .github/workflows/CI.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2552ce4e9..b63f6ee18 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -27,7 +27,7 @@ jobs: with: target: x86_64 args: -i python --release --out dist - - name: Install built wheel - x86_64 + - name: Install build wheel - x86_64 run: | pip install --force-reinstall dist/robyn*.whl cd ~ && python -c 'import robyn' @@ -35,7 +35,7 @@ jobs: uses: messense/maturin-action@v1 with: args: -i python --release --universal2 --out dist --no-sdist - - name: Install built wheel - universal2 + - name: Install build wheel - universal2 run: | pip install --force-reinstall dist/robyn*_universal2.whl cd ~ && python -c 'import robyn' @@ -68,7 +68,7 @@ jobs: with: target: ${{ matrix.target }} args: -i python --release --out dist --no-sdist - - name: Install built wheel + - name: Install build wheel shell: bash run: | pip install --force-reinstall dist/robyn*.whl @@ -102,7 +102,7 @@ jobs: target: ${{ matrix.target }} manylinux: auto args: -i python${{ matrix.python-version }} --release --out dist --no-sdist - - name: Install built wheel + - name: Install build wheel if: matrix.target == 'x86_64' run: | pip install --force-reinstall dist/robyn*.whl @@ -137,7 +137,7 @@ jobs: manylinux: auto args: -i python3.9 --release --out dist --no-sdist - uses: uraimo/run-on-arch-action@v2.2.0 - name: Install built wheel + name: Install build wheel with: arch: ${{ matrix.target }} distro: ubuntu20.04 @@ -151,7 +151,7 @@ jobs: apt-get install -y --no-install-recommends software-properties-common add-apt-repository ppa:deadsnakes/ppa apt-get update -y - apt-get install -y $PYTHON $PYTHON-distutils + apt-get install -y $PYTHON $PYTHON-distutils $PYTHON-venv run: | ls -lrth /artifacts PYTHON=python${{ matrix.python.version }} From 4207f6ffa86a0e877a7eaa4ce06f8592cfd97af3 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 13 Jul 2022 13:17:05 +0200 Subject: [PATCH 09/15] $PYTHON -m venv venv ; source venv/bin/activate --- .github/workflows/CI.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b63f6ee18..d404fc916 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -156,9 +156,11 @@ jobs: ls -lrth /artifacts PYTHON=python${{ matrix.python.version }} $PYTHON --version - $PYTHON -m pip install --upgrade pip html5lib - $PYTHON -m pip install --force-reinstall dist/robyn*.whl - cd ~ && $PYTHON -c 'import robyn' + $PYTHON -m venv venv + source venv/bin/activate + pip install --upgrade pip html5lib + install --force-reinstall dist/robyn*.whl + cd ~ && python -c 'import robyn' - name: Upload wheels uses: actions/upload-artifact@v3 with: From bf9e984bb94d40aa6def43f684ab1bd7af0a0dc0 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 13 Jul 2022 13:35:07 +0200 Subject: [PATCH 10/15] pip install --force-reinstall dist/robyn*.whl --- .github/workflows/CI.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d404fc916..ccae33baa 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -9,7 +9,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10"] + python-version: [3.11.0-beta.4] # ["3.7", "3.8", "3.9", "3.10"] steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -49,7 +49,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10"] + python-version: [3.11.0-beta.4] # ["3.7", "3.8", "3.9", "3.10"] target: [x64, x86] steps: - uses: actions/checkout@v3 @@ -83,7 +83,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10"] + python-version: [3.11.0-beta.4] # ["3.7", "3.8", "3.9", "3.10"] target: [x86_64, i686] steps: - uses: actions/checkout@v3 @@ -140,7 +140,7 @@ jobs: name: Install build wheel with: arch: ${{ matrix.target }} - distro: ubuntu20.04 + distro: ubuntu22.04 githubToken: ${{ github.token }} # Mount the dist directory as /artifacts in the container dockerRunArgs: | @@ -159,7 +159,7 @@ jobs: $PYTHON -m venv venv source venv/bin/activate pip install --upgrade pip html5lib - install --force-reinstall dist/robyn*.whl + pip install --force-reinstall dist/robyn*.whl cd ~ && python -c 'import robyn' - name: Upload wheels uses: actions/upload-artifact@v3 @@ -178,7 +178,7 @@ jobs: name: wheels - uses: actions/setup-python@v4 with: - python-version: 3.10 + python-version: 3.x - name: Publish to PyPi env: TWINE_USERNAME: __token__ From 4856919d3f9f207aeb4bf7c31cca3d417b97839e Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 13 Jul 2022 13:46:23 +0200 Subject: [PATCH 11/15] distro: ubuntu20.04 --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ccae33baa..0e1a5d79c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -140,7 +140,7 @@ jobs: name: Install build wheel with: arch: ${{ matrix.target }} - distro: ubuntu22.04 + distro: ubuntu20.04 githubToken: ${{ github.token }} # Mount the dist directory as /artifacts in the container dockerRunArgs: | From ad275acfb355807277e744023830167f8a01f307 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 13 Jul 2022 14:09:35 +0200 Subject: [PATCH 12/15] Update CI.yml --- .github/workflows/CI.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0e1a5d79c..78656c53f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -9,7 +9,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python-version: [3.11.0-beta.4] # ["3.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10"] steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -49,7 +49,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: [3.11.0-beta.4] # ["3.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10"] target: [x64, x86] steps: - uses: actions/checkout@v3 @@ -146,15 +146,14 @@ jobs: dockerRunArgs: | --volume "${PWD}/dist:/artifacts" install: | - PYTHON=python${{ matrix.python.version }} apt-get update -y apt-get install -y --no-install-recommends software-properties-common add-apt-repository ppa:deadsnakes/ppa apt-get update -y + PYTHON=python${{ matrix.python.version }} apt-get install -y $PYTHON $PYTHON-distutils $PYTHON-venv run: | ls -lrth /artifacts - PYTHON=python${{ matrix.python.version }} $PYTHON --version $PYTHON -m venv venv source venv/bin/activate From 8ef9c2f3063bfabf94fb9c49ba72116f2c7af078 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 13 Jul 2022 14:29:58 +0200 Subject: [PATCH 13/15] PYTHON=python${{ matrix.python.version }} * 2 --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 78656c53f..ffacadbd9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -154,6 +154,7 @@ jobs: apt-get install -y $PYTHON $PYTHON-distutils $PYTHON-venv run: | ls -lrth /artifacts + PYTHON=python${{ matrix.python.version }} $PYTHON --version $PYTHON -m venv venv source venv/bin/activate From c1ba8de15e8478418ac9aa8d5524f63c3e5a460d Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 13 Jul 2022 14:38:13 +0200 Subject: [PATCH 14/15] FINALLY!!! --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ffacadbd9..eb8706be1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -83,7 +83,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.11.0-beta.4] # ["3.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10"] target: [x86_64, i686] steps: - uses: actions/checkout@v3 From ab2e43a1ca0b489cde7d074b5f61d3307508a61a Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 13 Jul 2022 15:46:10 +0200 Subject: [PATCH 15/15] Drop html5lib --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index eb8706be1..cb9d998ec 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -158,7 +158,7 @@ jobs: $PYTHON --version $PYTHON -m venv venv source venv/bin/activate - pip install --upgrade pip html5lib + pip install --upgrade pip pip install --force-reinstall dist/robyn*.whl cd ~ && python -c 'import robyn' - name: Upload wheels