diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index f94b2a7..fc365f0 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -11,9 +11,9 @@ jobs: matrix: python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -32,7 +32,7 @@ jobs: run: tox -e check - name: Upload HTML documentation if: matrix.python-version == 3.9 - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: html-doc path: doc/_build/html @@ -43,9 +43,9 @@ jobs: needs: test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download HTML documentation from job 'test' - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: html-doc path: doc/_build/html @@ -57,7 +57,7 @@ jobs: branch: gh-pages folder: doc/_build/html - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.11' - name: Install dependencies diff --git a/MANIFEST.in b/MANIFEST.in index d4e0ca3..1bc76c7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,19 +1,20 @@ -include requirements.txt include LICENSE -recursive-include doc *.py -recursive-include doc *.robot -recursive-include doc *.rst -recursive-include doc *.yml -recursive-include doc Makefile -include tox.ini +include README.rst +include LICENSE + +recursive-include mlx *.py +recursive-exclude mlx *version__.py recursive-include mlx *.mako recursive-include mlx *.css -exclude mlx/xunit2rst/__version__.py +exclude .gitignore exclude .pylintrc -exclude doc/source/generated/* +exclude codecov.yml +exclude requirements.txt +exclude tox.ini -recursive-include tests *.py -recursive-include tests *.rst -recursive-include tests *.xml -exclude tests/test_out/* +recursive-exclude .github * +recursive-exclude build * +recursive-exclude doc * +recursive-exclude tests * +global-exclude *.py[co] diff --git a/pyproject.toml b/pyproject.toml index d9adb8c..91651cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,6 @@ [build-system] -requires = ["setuptools-scm>=6.0.0", "setuptools>=69.0.3"] +requires = ["setuptools-scm>=8.0.4", "setuptools>=71.0.4"] build-backend = "setuptools.build_meta" + +[tool.setuptools_scm] +write_to = "mlx/xunit2rst/__version__.py" diff --git a/setup.py b/setup.py index cf5c428..8b922b7 100644 --- a/setup.py +++ b/setup.py @@ -7,9 +7,6 @@ setup( name='mlx.xunit2rst', - use_scm_version={ - 'write_to': 'mlx/xunit2rst/__version__.py' - }, url='https://github.com/melexis/xunit2rst', license='Apache License Version 2.0', author='JasperCraeghs', @@ -36,7 +33,7 @@ 'Topic :: Utilities', ], platforms='any', - packages=find_namespace_packages(where='.'), + packages=find_namespace_packages(where=".", exclude=("doc.*", "doc", "tests.*", "tests", "build*")), package_dir={"": "."}, package_data={ 'mlx.xunit2rst': ['*.mako'], diff --git a/tox.ini b/tox.ini index 06f44a8..2accb3b 100644 --- a/tox.ini +++ b/tox.ini @@ -34,6 +34,7 @@ commands= [testenv:check] deps = {[testenv]deps} + setuptools>=71.0.4 docutils build twine >= 1.12.0 @@ -50,6 +51,7 @@ commands = [testenv:doc] deps= {[testenv]deps} + sphinx < 7.0 # temporary until traceability_attributes_sort no longer expects a function sphinx_rtd_theme mlx.traceability >= 4.3.2 mlx.warnings >= 5.0.0