From 82cc93b610e23092bb02a15c0da28ce3239eb6c7 Mon Sep 17 00:00:00 2001 From: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com> Date: Mon, 16 Aug 2021 16:06:57 +0530 Subject: [PATCH 1/4] chore: test on python 3.10 --- .github/workflows/ci.yml | 52 ++++++++++++---------------------------- local-requirements.txt | 6 +++++ 2 files changed, 21 insertions(+), 37 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72c467900..c480b4d73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,21 +20,20 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.9 - - name: Install dependencies + - name: Install dependencies & browsers run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip wheel pip install -r local-requirements.txt pip install -e . python setup.py bdist_wheel - python -m playwright install-deps - - name: Install browsers - run: python -m playwright install + python -m playwright install --with-deps - name: Lint uses: pre-commit/action@v2.0.3 - name: Generate APIs run: bash scripts/update_api.sh - name: Verify generated API is up to date run: git diff --exit-code + build: name: Build timeout-minutes: 30 @@ -44,28 +43,10 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - python-version: [3.7, 3.8] + os: [ubuntu-latest, windows-latest, macos-latest, macos-11.0] + python-version: [3.7, 3.8, 3.9, '3.10-dev'] browser: [chromium, firefox, webkit] - include: - - os: ubuntu-latest - python-version: 3.9 - browser: chromium - - os: windows-latest - python-version: 3.9 - browser: chromium - - os: macos-latest - python-version: 3.9 - browser: chromium - - os: macos-11.0 - python-version: 3.9 - browser: chromium - - os: macos-11.0 - python-version: 3.9 - browser: firefox - - os: macos-11.0 - python-version: 3.9 - browser: webkit + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 @@ -73,15 +54,13 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Install dependencies + - name: Install dependencies & browsers run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip wheel pip install -r local-requirements.txt pip install -e . python setup.py bdist_wheel - python -m playwright install-deps - - name: Install browsers - run: python -m playwright install + python -m playwright install --with-deps - name: Common Tests run: pytest tests/common --browser=${{ matrix.browser }} --timeout 90 - name: Test Reference count @@ -130,16 +109,14 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: 3.8 - - name: Install dependencies + python-version: 3.9 + - name: Install dependencies & browsers run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip wheel pip install -r local-requirements.txt pip install -e . python setup.py bdist_wheel - python -m playwright install-deps - - name: Install browsers - run: python -m playwright install ${{ matrix.browser-channel }} + python -m playwright install ${{ matrix.browser-channel }} --with-deps - name: Common Tests run: pytest tests/common --browser=chromium --browser-channel=${{ matrix.browser-channel }} --timeout 90 - name: Test Sync API @@ -159,6 +136,7 @@ jobs: with: name: ${{ matrix.browser-channel }}-${{ matrix.os }} path: pw-log.txt + build-conda: name: Conda Build strategy: diff --git a/local-requirements.txt b/local-requirements.txt index 3de72ebda..fa264cee7 100644 --- a/local-requirements.txt +++ b/local-requirements.txt @@ -23,3 +23,9 @@ twine==3.4.2 twisted==21.7.0 types-pyOpenSSL==20.0.6 wheel==0.37.0 +setuptools==57.0.0 +twine==3.4.1 +twisted==21.2.0 +# Python 3.10 +websockets @ https://github.com/aaugustin/websockets/archive/6edb363af07365867b4c372405b6ab3177a57830.tar.gz; python_version >= '3.10' +wheel==0.36.2 From e065d105f08264aa1251e8dc602c4ff5a0b283f8 Mon Sep 17 00:00:00 2001 From: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com> Date: Mon, 16 Aug 2021 16:24:47 +0530 Subject: [PATCH 2/4] chore: reduce jobs --- .github/workflows/ci.yml | 43 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c480b4d73..2d73bbdc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,10 +43,47 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest, macos-11.0] - python-version: [3.7, 3.8, 3.9, '3.10-dev'] + os: [ubuntu-latest, windows-latest, macos-latest] + python-version: [3.7, 3.8] browser: [chromium, firefox, webkit] - + include: + - os: ubuntu-latest + python-version: 3.9 + browser: chromium + - os: windows-latest + python-version: 3.9 + browser: chromium + - os: macos-latest + python-version: 3.9 + browser: chromium + - os: macos-11.0 + python-version: 3.9 + browser: chromium + - os: macos-11.0 + python-version: 3.9 + browser: firefox + - os: macos-11.0 + python-version: 3.9 + browser: webkit + - os: ubuntu-latest + python-version: '3.10-dev' + browser: chromium + # TODO: Enable windows once https://github.com/python-pillow/Pillow/issues/5569 is fixed + # - os: windows-latest + # python-version: '3.10-dev' + # browser: chromium + - os: macos-latest + python-version: '3.10-dev' + browser: chromium + - os: macos-11.0 + python-version: '3.10-dev' + browser: chromium + - os: macos-11.0 + python-version: '3.10-dev' + browser: firefox + - os: macos-11.0 + python-version: '3.10-dev' + browser: webkit runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 From a102346560d8c904e1803104b2cde274364ace8b Mon Sep 17 00:00:00 2001 From: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com> Date: Mon, 16 Aug 2021 16:33:39 +0530 Subject: [PATCH 3/4] chore: apply 3.10 labels --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 68447ac65..7aeebb682 100644 --- a/setup.py +++ b/setup.py @@ -153,6 +153,7 @@ def run(self) -> None: "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", ], From 517b0a3f03d939edff2b0abe7b18439020760820 Mon Sep 17 00:00:00 2001 From: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com> Date: Wed, 8 Sep 2021 13:40:21 +0530 Subject: [PATCH 4/4] chore: add windows --- .github/workflows/ci.yml | 13 +++---------- local-requirements.txt | 6 ------ 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d73bbdc4..d590b1e45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,22 +68,15 @@ jobs: - os: ubuntu-latest python-version: '3.10-dev' browser: chromium - # TODO: Enable windows once https://github.com/python-pillow/Pillow/issues/5569 is fixed - # - os: windows-latest - # python-version: '3.10-dev' - # browser: chromium - - os: macos-latest + - os: windows-latest python-version: '3.10-dev' browser: chromium - - os: macos-11.0 + - os: macos-latest python-version: '3.10-dev' browser: chromium - os: macos-11.0 python-version: '3.10-dev' - browser: firefox - - os: macos-11.0 - python-version: '3.10-dev' - browser: webkit + browser: chromium runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 diff --git a/local-requirements.txt b/local-requirements.txt index fa264cee7..3de72ebda 100644 --- a/local-requirements.txt +++ b/local-requirements.txt @@ -23,9 +23,3 @@ twine==3.4.2 twisted==21.7.0 types-pyOpenSSL==20.0.6 wheel==0.37.0 -setuptools==57.0.0 -twine==3.4.1 -twisted==21.2.0 -# Python 3.10 -websockets @ https://github.com/aaugustin/websockets/archive/6edb363af07365867b4c372405b6ab3177a57830.tar.gz; python_version >= '3.10' -wheel==0.36.2