Skip to content

Commit

Permalink
General maintenance (#105)
Browse files Browse the repository at this point in the history
  • Loading branch information
maximlt authored Jan 30, 2023
1 parent 62231c5 commit b273398
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 29 deletions.
33 changes: 16 additions & 17 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,31 @@ jobs:
fail-fast: false
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
timeout-minutes: 45
defaults:
run:
shell: bash -l {0}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
# env:
# SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
steps:
- uses: actions/checkout@v3
with:
fetch-depth: "1"
fetch-depth: "100"
- name: fetch tags
run: git fetch --tags
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: setup pyctdev
- name: setup
run: |
python3 -m pip install --upgrade setuptools pip wheel
python3 -m pip install pyctdev
- name: install test deps
run: doit develop_install -o cmd -o tests
- name: doit test_flakes
run: doit test_flakes
- name: doit test_unit
run: doit test_unit
- name: doit test_cmd_examples
run: doit test_cmd_examples
- name: doit test_build_examples
run: doit test_build_examples
python3 -m pip install "tox<4" tox-gh-actions
- name: flakes
run: tox -e flakes
- name: unit
run: tox -e unit
- name: _cmd_examples
run: tox -e cmd_examples
- name: _build_examples
run: tox -e build_examples
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ venv/

# autover
*/.version

build/
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[build-system]
requires = [
"param >=1.7.0",
"setuptools >=30.3.0"
"setuptools >=61.0"
]
build-backend = "setuptools.build_meta"
5 changes: 0 additions & 5 deletions setup.cfg

This file was deleted.

3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ def get_setup_version(root, reponame):
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
Expand All @@ -61,7 +60,7 @@ def get_setup_version(root, reponame):
},
include_package_data=True,
packages=find_packages(),
python_requires='>=3.6',
python_requires='>=3.7',
install_requires=[
'param >=1.7.0',
],
Expand Down
17 changes: 13 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
[tox]
envlist = {py36,py37,py38,py39,py310,py311}-{flakes,unit,cmd_examples,build_examples,all}-{default}-{dev,pkg}
envlist = {py37,py38,py39,py310,py311}-{flakes,unit,cmd_examples,build_examples,all}-{default}-{dev,pkg}
build = wheel

[gh-actions]
python =
3.7: py37
3.8: py38
3.9: py39
3.10: py310
3.11: py311

[_flakes]
commands = flake8
deps = .[tests]

[_cmd_examples]
commands = pytest pyct
python3 -c "import pyct; pyct.report('pyct','python','system')"
{envpython} -c "import pyct; pyct.report('pyct','python','system')"
deps = .[tests,cmd]

[_build_examples]
# TODO: not much of a test yet...
commands = python3 -c "from pyct.build import examples, get_setup_version"
commands = {envpython} -c "from pyct.build import examples, get_setup_version"
deps = .[tests]

[_all]
Expand All @@ -31,9 +39,10 @@ commands = pytest pyct
pyct --version
pyct report --help
pyct report pyct python
python3 -m pyct --version
{envpython} -m pyct --version

[testenv]
usedevelop = true
changedir = {envtmpdir}

commands = unit: {[_unit]commands}
Expand Down

0 comments on commit b273398

Please sign in to comment.