From 720de6b2f73af551022b0fa5b583907c5d89dbc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=A1o=20Belica?= Date: Thu, 9 May 2024 09:01:48 +0000 Subject: [PATCH 1/2] Fix issue with new version of lxml --- .github/workflows/run-tests.yml | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f596a9e..b82fb7e 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -24,13 +24,13 @@ jobs: run: | python -m pip install --upgrade pip # pytest 4.6.X works best for older Python versions - pip install -U lxml "pytest==4.6.9" codecov 'coverage==4.5.4' pytest-cov + pip install -U "lxml[html_clean]" "pytest==4.6.9" codecov 'coverage==4.5.4' pytest-cov if: ${{ matrix.python-version == '2.7' }} - name: "Install dependencies (up to date)" run: | python -m pip install --upgrade pip - pip install -U lxml pytest codecov coverage pytest-cov + pip install -U "lxml[html_clean]" pytest codecov coverage pytest-cov if: ${{ matrix.python-version != '2.7' }} - run: py.test tests diff --git a/setup.py b/setup.py index dab723d..63a92db 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ url="https://github.com/miso-belica/jusText", license="The BSD 2-Clause License", install_requires=[ - 'lxml >= 4.4.2', + 'lxml[html_clean] >= 4.4.2', 'backports.functools-lru-cache; python_version < "3.2"' ], tests_require=[ From e5524c426168169297cd318230a8a513afccedf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=A1o=20Belica?= Date: Thu, 9 May 2024 09:09:02 +0000 Subject: [PATCH 2/2] CI: update supported Python versions and actions --- .github/workflows/publish-to-pypi.yaml | 4 ++-- .github/workflows/run-tests.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yaml b/.github/workflows/publish-to-pypi.yaml index 7b6279c..ebc23f6 100644 --- a/.github/workflows/publish-to-pypi.yaml +++ b/.github/workflows/publish-to-pypi.yaml @@ -8,10 +8,10 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: '3.x' diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b82fb7e..921de24 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -11,12 +11,12 @@ jobs: timeout-minutes: 15 strategy: matrix: - python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }}