Skip to content

Commit

Permalink
Merge branch 'fix/update-build-system' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
fwitte committed Jun 27, 2024
2 parents 659efdb + 876e9c6 commit e3fc90b
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 55 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: ["3.10"]
python-version: ["3.11"]

steps:
- uses: actions/checkout@v1
Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/tox_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,17 @@ jobs:
strategy:
matrix:
toxenv:
- clean
- check
- docs

steps:
- 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
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/tox_pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- cron: "0 5 * * 6" # 5:00 UTC every Saturday

jobs:
build:
pytest:
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 2 additions & 0 deletions docs/whats_new/v0-7-5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ Other Features
##############
- More isolines are now available for the drum
(`PR #521 <https://github.com/oemof/tespy/pull/521>`__).
- Remove unused features in the github workflows and tox testing
(`PR #523 <https://github.com/oemof/tespy/pull/523>`__).

Contributors
############
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ include = [
"CHANGELOG.rst",
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"MANIFEST.in",
"LICENSE*",
"PULL_REQUEST_TEMPLATE.md",
".coveragerc",
Expand Down
52 changes: 7 additions & 45 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[tox]
envlist =
clean,
check,
docs,
py39,
py310,
py311,
report
py311

[gh-actions]
python =
Expand All @@ -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}
Expand All @@ -83,7 +48,6 @@ usedevelop = true
commands =
{posargs:pytest --cov --cov-report=term-missing -vv}
deps =
{[testenv]deps}
pytest-cov

[testenv:py310]
Expand All @@ -94,7 +58,6 @@ usedevelop = true
commands =
{posargs:pytest --cov --cov-report=term-missing -vv}
deps =
{[testenv]deps}
pytest-cov

[testenv:py311]
Expand All @@ -105,5 +68,4 @@ usedevelop = true
commands =
{posargs:pytest --cov --cov-report=term-missing -vv}
deps =
{[testenv]deps}
pytest-cov

0 comments on commit e3fc90b

Please sign in to comment.