Skip to content

Commit

Permalink
Merge pull request #50 from melexis/fix-artifacts
Browse files Browse the repository at this point in the history
Upgrade GitHub actions and remove unneeded files from package
  • Loading branch information
Letme authored Sep 16, 2024
2 parents f1e0b3f + bced659 commit 7032e85
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 24 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
27 changes: 14 additions & 13 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -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]
5 changes: 4 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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'],
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ commands=
[testenv:check]
deps =
{[testenv]deps}
setuptools>=71.0.4
docutils
build
twine >= 1.12.0
Expand All @@ -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
Expand Down

0 comments on commit 7032e85

Please sign in to comment.