From c4d7f5e7a996e7e5e5c32e947c026d29df5315d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Mon, 2 Jan 2023 13:41:08 +0100 Subject: [PATCH 1/3] Use CLang to build Reppy --- .github/workflows/checks.yml | 12 ++++++++++-- .github/workflows/tests-ubuntu.yml | 13 ++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 8c1ae4bd3..e5b0306b3 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -14,10 +14,12 @@ jobs: - python-version: "3.11" env: TOXENV: flake8 - # Pylint requires installing reppy, which does not support Python 3.9 - # https://github.com/seomoz/reppy/issues/122 + # Pylint requires installing reppy, which: + # - Does not support Python 3.9: https://github.com/seomoz/reppy/issues/122 + # - Requires CLang to build https://github.com/seomoz/reppy/issues/132 - python-version: 3.8 env: + CC: clang TOXENV: pylint - python-version: 3.7 env: @@ -37,6 +39,12 @@ jobs: with: python-version: ${{ matrix.python-version }} + - name: Set up Clang + uses: egor-tensin/setup-clang@v1 + with: + version: latest + platform: x64 + - name: Run check env: ${{ matrix.env }} run: | diff --git a/.github/workflows/tests-ubuntu.yml b/.github/workflows/tests-ubuntu.yml index 9c3ce8115..4ad722ad5 100644 --- a/.github/workflows/tests-ubuntu.yml +++ b/.github/workflows/tests-ubuntu.yml @@ -38,11 +38,12 @@ jobs: env: TOXENV: pypy3-pinned - # extras - # extra-deps includes reppy, which does not support Python 3.9 - # https://github.com/seomoz/reppy/issues/122 + # extra-deps includes reppy, which: + # - Does not support Python 3.9: https://github.com/seomoz/reppy/issues/122 + # - Requires CLang to build https://github.com/seomoz/reppy/issues/132 - python-version: 3.8 env: + CC: clang TOXENV: extra-deps steps: @@ -59,6 +60,12 @@ jobs: sudo apt-get update sudo apt-get install libxml2-dev libxslt-dev + - name: Set up Clang + uses: egor-tensin/setup-clang@v1 + with: + version: latest + platform: x64 + - name: Run tests env: ${{ matrix.env }} run: | From e47ada2c7cc7c31f31e54652d5b7f893678198af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Mon, 2 Jan 2023 13:49:25 +0100 Subject: [PATCH 2/3] Add CC to tox.ini:[testenv]passenv --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 0e156d63b..865ef5383 100644 --- a/tox.ini +++ b/tox.ini @@ -21,6 +21,7 @@ deps = # Extras botocore>=1.4.87 passenv = + CC S3_TEST_FILE_URI AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY From 016d1de64eebf6abd929ab7fb0037334da66677b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Mon, 2 Jan 2023 14:13:04 +0100 Subject: [PATCH 3/3] Remove Reppy from CI --- .github/workflows/checks.yml | 12 +----------- .github/workflows/tests-ubuntu.yml | 12 +----------- tox.ini | 8 ++------ 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index e5b0306b3..e9f9a6aea 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -14,12 +14,8 @@ jobs: - python-version: "3.11" env: TOXENV: flake8 - # Pylint requires installing reppy, which: - # - Does not support Python 3.9: https://github.com/seomoz/reppy/issues/122 - # - Requires CLang to build https://github.com/seomoz/reppy/issues/132 - - python-version: 3.8 + - python-version: "3.11" env: - CC: clang TOXENV: pylint - python-version: 3.7 env: @@ -39,12 +35,6 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Set up Clang - uses: egor-tensin/setup-clang@v1 - with: - version: latest - platform: x64 - - name: Run check env: ${{ matrix.env }} run: | diff --git a/.github/workflows/tests-ubuntu.yml b/.github/workflows/tests-ubuntu.yml index 4ad722ad5..8fcf90a18 100644 --- a/.github/workflows/tests-ubuntu.yml +++ b/.github/workflows/tests-ubuntu.yml @@ -38,12 +38,8 @@ jobs: env: TOXENV: pypy3-pinned - # extra-deps includes reppy, which: - # - Does not support Python 3.9: https://github.com/seomoz/reppy/issues/122 - # - Requires CLang to build https://github.com/seomoz/reppy/issues/132 - - python-version: 3.8 + - python-version: "3.11" env: - CC: clang TOXENV: extra-deps steps: @@ -60,12 +56,6 @@ jobs: sudo apt-get update sudo apt-get install libxml2-dev libxslt-dev - - name: Set up Clang - uses: egor-tensin/setup-clang@v1 - with: - version: latest - platform: x64 - - name: Run tests env: ${{ matrix.env }} run: | diff --git a/tox.ini b/tox.ini index 865ef5383..cc529fc70 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,6 @@ deps = # Extras botocore>=1.4.87 passenv = - CC S3_TEST_FILE_URI AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY @@ -64,8 +63,7 @@ commands = flake8 {posargs:docs scrapy tests} [testenv:pylint] -# reppy does not support Python 3.9+ -basepython = python3.8 +basepython = python3 deps = {[testenv:extra-deps]deps} pylint==2.15.6 @@ -128,8 +126,7 @@ setenv = {[pinned]setenv} [testenv:extra-deps] -# reppy does not support Python 3.9+ -basepython = python3.8 +basepython = python3 deps = {[testenv]deps} boto @@ -137,7 +134,6 @@ deps = # Twisted[http2] currently forces old mitmproxy because of h2 version # restrictions in their deps, so we need to pin old markupsafe here too. markupsafe < 2.1.0 - reppy robotexclusionrulesparser Pillow>=4.0.0 Twisted[http2]>=17.9.0