diff --git a/.coverage b/.coverage index 672c021..3b6976f 100644 Binary files a/.coverage and b/.coverage differ diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 42dc635..caf3c4f 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -2,6 +2,11 @@ name: Json2xml on: [push, pull_request] +permissions: + contents: read + checks: write # For test results + pull-requests: write # For codecov + concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -12,8 +17,8 @@ jobs: strategy: fail-fast: false matrix: - python-version: [pypy-3.10, '3.10', '3.11' , '3.12', '3.13'] - tox-python-version: ['pypy3.10', 'py310', 'py311' , 'py312', 'py313'] + python-version: [pypy-3.10, '3.10', '3.11', '3.12', '3.13'] + tox-python-version: [pypy3.10, py310, py311, py312, py313] os: [ ubuntu-latest, windows-latest, @@ -21,15 +26,15 @@ jobs: ] include: # Add exact version 3.14.0-alpha.0 for ubuntu-latest only - - python-version: '3.14.0-alpha.5' + - python-version: 3.14.0-alpha.5 tox-python-version: py314-full os: ubuntu-latest exclude: # Exclude other OSes with Python 3.14.0-alpha.0 - - python-version: '3.14.0-alpha.5' + - python-version: 3.14.0-alpha.5 tox-python-version: py314-full os: windows-latest - - python-version: '3.14.0-alpha.5' + - python-version: 3.14.0-alpha.5 os: macos-latest tox-python-version: py314-full @@ -56,13 +61,14 @@ jobs: run: tox -e ${{matrix.tox-python-version}} - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 - with: - token: ${{ secrets.CODECOV_TOKEN }} - - - name: Upload test results to Codecov - if: ${{ !cancelled() }} - uses: codecov/test-results-action@v1 + uses: codecov/codecov-action@v5 with: + directory: ./coverage/reports/ + env_vars: OS,PYTHON + fail_ci_if_error: true + files: ./coverage.xml,./coverage2.xml,!./cache + flags: unittests token: ${{ secrets.CODECOV_TOKEN }} + name: codecov-umbrella + verbose: true diff --git a/docs/requirements.in b/docs/requirements.in index e6f9828..7bfb758 100644 --- a/docs/requirements.in +++ b/docs/requirements.in @@ -1,4 +1,4 @@ -furo==2024.5.6 +furo==2024.8.6 sphinx sphinx-autobuild @@ -9,6 +9,6 @@ mock autodoc defusedxml -tornado==6.4.2 -jinja2==3.1.5 -idna==3.7 +tornado +jinja2 +idna diff --git a/docs/requirements.txt b/docs/requirements.txt index 310ccb3..f50d230 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -4,33 +4,42 @@ # # pip-compile # -alabaster==0.7.12 +alabaster==1.0.0 # via sphinx +anyio==4.8.0 + # via + # starlette + # watchfiles autodoc==0.5.0 # via -r requirements.in -babel==2.9.1 +babel==2.17.0 # via sphinx -beautifulsoup4==4.10.0 +beautifulsoup4==4.13.3 # via # furo # webtest -certifi==2024.7.4 +certifi==2025.1.31 # via requests -charset-normalizer==2.0.6 +charset-normalizer==3.4.1 # via requests -colorama==0.4.4 +click==8.1.8 + # via uvicorn +colorama==0.4.6 # via sphinx-autobuild -decorator==5.1.0 +decorator==5.1.1 # via autodoc defusedxml==0.7.1 # via -r requirements.in -docutils==0.20.1 +docutils==0.21.2 # via sphinx -furo==2024.5.6 +furo==2024.8.6 # via -r requirements.in -idna==3.7 +h11==0.14.0 + # via uvicorn +idna==3.10 # via # -r requirements.in + # anyio # requests imagesize==1.4.1 # via sphinx @@ -38,65 +47,70 @@ jinja2==3.1.5 # via # -r requirements.in # sphinx -livereload==2.6.3 - # via sphinx-autobuild -markupsafe==2.0.1 +markupsafe==3.0.2 # via jinja2 -mock==4.0.3 +mock==5.1.0 # via -r requirements.in -packaging==21.0 +packaging==24.2 # via sphinx -pygments==2.15.0 +pygments==2.19.1 # via # furo # sphinx -pyparsing==2.4.7 - # via packaging -pytz==2021.3 - # via babel -requests==2.32.0 +requests==2.32.3 + # via sphinx +roman-numerals-py==3.0.0 # via sphinx -six==1.16.0 - # via livereload -snowballstemmer==2.1.0 +sniffio==1.3.1 + # via anyio +snowballstemmer==2.2.0 # via sphinx -soupsieve==2.2.1 +soupsieve==2.6 # via beautifulsoup4 -sphinx==7.2.6 +sphinx==8.2.0 # via # -r requirements.in # furo # sphinx-autobuild # sphinx-autodoc-typehints # sphinx-basic-ng - # sphinxcontrib-serializinghtml -sphinx-autobuild==2021.3.14 +sphinx-autobuild==2024.10.3 # via -r requirements.in -sphinx-autodoc-typehints==1.12.0 +sphinx-autodoc-typehints==3.1.0 # via -r requirements.in sphinx-basic-ng==1.0.0b2 # via furo -sphinxcontrib-applehelp==1.0.2 +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==2.0.0 # via sphinx -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.9 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx +starlette==0.45.3 + # via sphinx-autobuild tornado==6.4.2 + # via -r requirements.in +typing-extensions==4.12.2 # via - # -r requirements.in - # livereload -urllib3==1.26.19 + # anyio + # beautifulsoup4 +urllib3==2.3.0 # via requests -waitress==3.0.1 +uvicorn==0.34.0 + # via sphinx-autobuild +waitress==3.0.2 # via webtest -webob==1.8.8 +watchfiles==1.0.4 + # via sphinx-autobuild +webob==1.8.9 # via webtest -webtest==3.0.0 +websockets==15.0 + # via sphinx-autobuild +webtest==3.0.4 # via autodoc diff --git a/junit.xml b/junit.xml deleted file mode 100644 index fef39a8..0000000 --- a/junit.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 549db1a..cef204f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,5 +6,5 @@ # defusedxml==0.7.1 # via -r requirements.in -urllib3==1.26.19 +urllib3==2.3.0 # via -r requirements.in diff --git a/tox.ini b/tox.ini index 9b77069..dd93d0e 100644 --- a/tox.ini +++ b/tox.ini @@ -9,4 +9,4 @@ deps = allowlist_externals = pytest commands = - pytest --cov --junitxml=junit.xml + pytest --cov --junitxml=coverage.xml