Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
fwitte committed Jul 8, 2024
2 parents c398407 + 69d158c commit 8f2c5f3
Show file tree
Hide file tree
Showing 57 changed files with 8,727 additions and 2,208 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
3 changes: 2 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ sphinx:
# formats: all ## none appart from html required here
python:
install:
- requirements: docs/requirements.txt
- method: pip
path: .
extra_requirements:
- dev
build:
os: ubuntu-22.04
tools:
Expand Down
5 changes: 2 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
The developer rules can be found in the chapter
[developing TESPy](https://tespy.readthedocs.io/en/dev/developing_tespy.html)
of the tespy.documentation.
The developer rules can be found in the
[online documentation](https://tespy.readthedocs.io/).
19 changes: 0 additions & 19 deletions MANIFEST.in

This file was deleted.

Loading

0 comments on commit 8f2c5f3

Please sign in to comment.