From 6cc21d8a6325457743150a64e56a3c90e3ccc5b8 Mon Sep 17 00:00:00 2001 From: Francesco Witte Date: Thu, 27 Jun 2024 20:03:16 +0200 Subject: [PATCH 1/5] Try to simplify github actions --- .github/workflows/packaging.yml | 4 ++-- .github/workflows/tox_checks.yml | 2 -- .github/workflows/tox_pytest.yml | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index aba1d8300..8fd603e88 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -26,9 +26,9 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python -m pip install --upgrade pip setuptools setuptools_scm twine wheel flit + python -m pip install --upgrade pip twine build flit - name: Create packages - run: python -m flit build + run: python -m build . - name: Run twine check run: twine check dist/* - uses: actions/upload-artifact@v2 diff --git a/.github/workflows/tox_checks.yml b/.github/workflows/tox_checks.yml index 5cd8e4117..b16641b2d 100644 --- a/.github/workflows/tox_checks.yml +++ b/.github/workflows/tox_checks.yml @@ -22,7 +22,6 @@ jobs: strategy: matrix: toxenv: - - clean - check - docs @@ -46,7 +45,6 @@ jobs: - name: Install dependencies run: | python -m pip install -U pip - python -m pip install -U setuptools wheel python -m pip install -U tox - name: Run ${{ matrix.toxenv }} run: python -m tox -e ${{ matrix.toxenv }} diff --git a/.github/workflows/tox_pytest.yml b/.github/workflows/tox_pytest.yml index ba825bd49..0742818b1 100644 --- a/.github/workflows/tox_pytest.yml +++ b/.github/workflows/tox_pytest.yml @@ -14,7 +14,7 @@ on: - cron: "0 5 * * 6" # 5:00 UTC every Saturday jobs: - build: + pytest: runs-on: ubuntu-latest strategy: matrix: From 09d30993e976701f16903dbbd35ef2ae75cae739 Mon Sep 17 00:00:00 2001 From: Francesco Witte Date: Thu, 27 Jun 2024 20:03:34 +0200 Subject: [PATCH 2/5] Simplify tox setup --- tox.ini | 52 +++++++--------------------------------------------- 1 file changed, 7 insertions(+), 45 deletions(-) diff --git a/tox.ini b/tox.ini index 8e5d3fd79..d926e3676 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,10 @@ [tox] envlist = - clean, check, docs, py39, py310, - py311, - report + py311 [gh-actions] python = @@ -16,64 +14,31 @@ python = [testenv] basepython = - docs: {env:TOXPYTHON:python3.10} - {bootstrap,clean,check,report,coveralls}: {env:TOXPYTHON:python3} + {check,docs}: {env:TOXPYTHON:python3.11} setenv = PYTHONPATH={toxinidir}/tests PYTHONUNBUFFERED=yes passenv = * -deps = - .[dev] +extras = + dev commands = {posargs:pytest -vv --ignore=src} -[testenv:bootstrap] -deps = - jinja2 - matrix -skip_install = true -commands = - python ci/bootstrap.py --no-env - [testenv:check] deps = check-manifest - flit - readme-renderer - pygments isort skip_install = true commands = check-manifest {toxinidir} - isort --verbose --check-only --diff --recursive src tests + isort --verbose --check-only --diff src tests [testenv:docs] usedevelop = true -deps = - -r{toxinidir}/docs/requirements.txt commands = - sphinx-build {posargs:-E} -b html docs dist/docs - sphinx-build -b linkcheck docs dist/docs - -[testenv:coveralls] -deps = - coveralls -skip_install = true -commands = - coveralls [] - -[testenv:report] -deps = coverage -skip_install = true -commands = - coverage report - coverage html - -[testenv:clean] -commands = coverage erase -skip_install = true -deps = coverage[toml] + sphinx-build {posargs:-E} -b html docs docs/_build + sphinx-build -b linkcheck docs docs/_build [testenv:py39] basepython = {env:TOXPYTHON:python3.9} @@ -83,7 +48,6 @@ usedevelop = true commands = {posargs:pytest --cov --cov-report=term-missing -vv} deps = - {[testenv]deps} pytest-cov [testenv:py310] @@ -94,7 +58,6 @@ usedevelop = true commands = {posargs:pytest --cov --cov-report=term-missing -vv} deps = - {[testenv]deps} pytest-cov [testenv:py311] @@ -105,5 +68,4 @@ usedevelop = true commands = {posargs:pytest --cov --cov-report=term-missing -vv} deps = - {[testenv]deps} pytest-cov From 2d27ff8aa92db3f69e59d3a07379b565a373b561 Mon Sep 17 00:00:00 2001 From: Francesco Witte Date: Thu, 27 Jun 2024 20:03:57 +0200 Subject: [PATCH 3/5] Remove unnecessary entry in sdist list --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fc4f226f4..7004200d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,6 @@ include = [ "CHANGELOG.rst", "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", - "MANIFEST.in", "LICENSE*", "PULL_REQUEST_TEMPLATE.md", ".coveragerc", From 296f6657c471761932b1759365b586e857d766de Mon Sep 17 00:00:00 2001 From: Francesco Witte Date: Thu, 27 Jun 2024 20:05:24 +0200 Subject: [PATCH 4/5] Bump python version --- .github/workflows/packaging.yml | 2 +- .github/workflows/tox_checks.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 8fd603e88..3979d73fb 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -16,7 +16,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ["3.10"] + python-version: ["3.11"] steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/tox_checks.yml b/.github/workflows/tox_checks.yml index b16641b2d..2b8e5808d 100644 --- a/.github/workflows/tox_checks.yml +++ b/.github/workflows/tox_checks.yml @@ -29,10 +29,10 @@ jobs: - name: Git clone uses: actions/checkout@v2 - - name: Set up Python ${{ env.default_python || '3.10' }} + - name: Set up Python ${{ env.default_python || '3.11' }} uses: actions/setup-python@v2 with: - python-version: "${{ env.default_python || '3.10' }}" + python-version: "${{ env.default_python || '3.11' }}" - name: Pip cache uses: actions/cache@v2 From 876e9c698451f5e1071816922d8dc1b257914688 Mon Sep 17 00:00:00 2001 From: Francesco Witte Date: Thu, 27 Jun 2024 20:07:54 +0200 Subject: [PATCH 5/5] Update what's new --- docs/conf.py | 2 +- docs/whats_new/v0-7-5.rst | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index ad8982f2e..5312e4b2d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -34,7 +34,7 @@ # master_doc = 'contents' # names, years, etc project = 'TESPy' -year = '2023' +year = '2024' author = 'Francesco Witte' copyright = '{0}, {1}'.format(year, author) diff --git a/docs/whats_new/v0-7-5.rst b/docs/whats_new/v0-7-5.rst index 21d6c22a2..f8bb39d8a 100644 --- a/docs/whats_new/v0-7-5.rst +++ b/docs/whats_new/v0-7-5.rst @@ -13,6 +13,8 @@ Other Features ############## - More isolines are now available for the drum (`PR #521 `__). +- Remove unused features in the github workflows and tox testing + (`PR #523 `__). Contributors ############