Skip to content

Commit 8f2c5f3

Browse files
committed
Merge branch 'dev'
2 parents c398407 + 69d158c commit 8f2c5f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+8727
-2208
lines changed

.github/workflows/packaging.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
max-parallel: 4
1818
matrix:
19-
python-version: ["3.10"]
19+
python-version: ["3.11"]
2020

2121
steps:
2222
- uses: actions/checkout@v1
@@ -26,9 +26,9 @@ jobs:
2626
python-version: ${{ matrix.python-version }}
2727
- name: Install dependencies
2828
run: |
29-
python -m pip install --upgrade pip setuptools setuptools_scm twine wheel flit
29+
python -m pip install --upgrade pip twine build flit
3030
- name: Create packages
31-
run: python -m flit build
31+
run: python -m build .
3232
- name: Run twine check
3333
run: twine check dist/*
3434
- uses: actions/upload-artifact@v2

.github/workflows/tox_checks.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,17 @@ jobs:
2222
strategy:
2323
matrix:
2424
toxenv:
25-
- clean
2625
- check
2726
- docs
2827

2928
steps:
3029
- name: Git clone
3130
uses: actions/checkout@v2
3231

33-
- name: Set up Python ${{ env.default_python || '3.10' }}
32+
- name: Set up Python ${{ env.default_python || '3.11' }}
3433
uses: actions/setup-python@v2
3534
with:
36-
python-version: "${{ env.default_python || '3.10' }}"
35+
python-version: "${{ env.default_python || '3.11' }}"
3736

3837
- name: Pip cache
3938
uses: actions/cache@v2
@@ -46,7 +45,6 @@ jobs:
4645
- name: Install dependencies
4746
run: |
4847
python -m pip install -U pip
49-
python -m pip install -U setuptools wheel
5048
python -m pip install -U tox
5149
- name: Run ${{ matrix.toxenv }}
5250
run: python -m tox -e ${{ matrix.toxenv }}

.github/workflows/tox_pytest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
- cron: "0 5 * * 6" # 5:00 UTC every Saturday
1515

1616
jobs:
17-
build:
17+
pytest:
1818
runs-on: ubuntu-latest
1919
strategy:
2020
matrix:

.readthedocs.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ sphinx:
55
# formats: all ## none appart from html required here
66
python:
77
install:
8-
- requirements: docs/requirements.txt
98
- method: pip
109
path: .
10+
extra_requirements:
11+
- dev
1112
build:
1213
os: ubuntu-22.04
1314
tools:

CONTRIBUTING.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
The developer rules can be found in the chapter
2-
[developing TESPy](https://tespy.readthedocs.io/en/dev/developing_tespy.html)
3-
of the tespy.documentation.
1+
The developer rules can be found in the
2+
[online documentation](https://tespy.readthedocs.io/).

MANIFEST.in

-19
This file was deleted.

0 commit comments

Comments
 (0)