Skip to content

Commit 6544f61

Browse files
Merge pull request #82 from UIUCLibrary/dev
Dev
2 parents a67a968 + 6a59612 commit 6544f61

Some content is hidden

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

61 files changed

+1498
-137
lines changed

.github/workflows/tox_matrix.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
on: [push, pull_request]
22
name: Tox Multi-platform Compatibility Test
3+
4+
concurrency:
5+
group: ${{ github.workflow }}-${{ github.ref }}
6+
cancel-in-progress: true
7+
38
jobs:
49
build:
510
runs-on: ${{ matrix.os }}
611
strategy:
712
matrix:
8-
os: [ubuntu-latest, macos-latest, windows-2019]
9-
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
10-
include:
11-
- os: macos-latest
12-
- os: ubuntu-latest
13-
- os: windows-2019
13+
os: [ubuntu-latest, macos-latest, windows-latest]
14+
python-version: ['3.10', '3.11', '3.12', '3.13']
1415
fail-fast: false
1516
name: Python ${{ matrix.python-version }} ${{ matrix.os }} build
1617
steps:
@@ -21,9 +22,8 @@ jobs:
2122
cache: 'pip' # caching pip dependencies
2223
- name: Install requirements
2324
run: |
24-
pip install wheel
25-
pip install -r requirements/requirements_tox.txt
25+
pip install uv
2626
- name: Run tox
27-
run: tox -e py -vvv
27+
run: uv run --only-group tox --with tox-uv --isolated tox -e py -vvv
2828
env:
2929
PIP_EXTRA_INDEX_URL: ${{vars.PIP_EXTRA_INDEX_URL}}

MANIFEST.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Include the license file
2-
include LICENSE tox.ini README.rst requirements.txt
2+
include LICENSE tox.ini README.rst
33

44
include docs/make.bat docs/Makefile
55

6-
recursive-include requirements *.txt
76
recursive-include docs/source *
87
recursive-include tests *.py

pyproject.toml

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
55
[project]
66
name = "dcc_qc"
77
version = "0.1.3.dev0"
8-
requires-python = ">=3.9"
8+
requires-python = ">=3.10"
99

1010
readme = "README.rst"
1111
license = {text = "University of Illinois/NCSA Open Source License"}
@@ -17,12 +17,38 @@ maintainers = [
1717
]
1818
description = "This package is for performing automated quality control tests on file packages"
1919
classifiers = [
20-
"Programming Language :: Python :: 3.8",
21-
"Programming Language :: Python :: 3.9",
20+
"Programming Language :: Python :: 3.10",
2221
"License :: OSI Approved :: University of Illinois/NCSA Open Source License",
2322
"Topic :: System :: Archiving :: Packaging",
2423
]
2524

25+
[dependency-groups]
26+
docs = ["sphinx"]
27+
type_checking = [
28+
"mypy",
29+
"lxml",
30+
]
31+
32+
lint = [
33+
"flake8",
34+
{include-group = "type_checking"},
35+
]
36+
tox = ["tox"]
37+
test = [
38+
"coverage[toml]",
39+
"pytest",
40+
]
41+
dev = [
42+
{include-group = "docs"},
43+
{include-group = "lint"},
44+
{include-group = "test"},
45+
{include-group = "tox"},
46+
]
47+
release = ["twine"]
48+
ci = [
49+
{include-group = "release"},
50+
{include-group = "dev"},
51+
]
2652

2753
[tool.setuptools]
2854
packages = [
@@ -34,6 +60,7 @@ packages = [
3460
"dcc_qc.reports",
3561
"dcc_qc.validator",
3662
]
63+
package-dir = {"dcc_qc" = "src/dcc_qc"}
3764
zip-safe = false
3865

3966

@@ -60,7 +87,6 @@ testpaths = [
6087
"tests"
6188
]
6289

63-
64-
6590
[tool.mypy]
6691
ignore_missing_imports = true
92+
mypy_path = "src"

requirements-ci.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

requirements.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

requirements/requirements-ci-freeze.txt

Lines changed: 0 additions & 52 deletions
This file was deleted.

requirements/requirements-ci.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

requirements/requirements.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

requirements/requirements_tox.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)