Skip to content

Commit 1ef4a24

Browse files
authored
Update pyproject.toml license settings and minimum python version (#30)
1 parent a5e59e1 commit 1ef4a24

File tree

2 files changed

+33
-18
lines changed

2 files changed

+33
-18
lines changed

pyproject.toml

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
[build-system]
2-
requires = ["setuptools>=65.5.0", "setuptools_scm[toml]>=6.4.0"]
2+
requires = ["setuptools>=77.0.0", "setuptools_scm[toml]>=6.4.0"]
33
build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "dissect.ole"
77
description = "A Dissect module implementing a parser for the Object Linking & Embedding (OLE) format, commonly used by document editors on Windows operating systems"
88
readme = "README.md"
9-
requires-python = "~=3.9"
10-
license.text = "Affero General Public License v3"
9+
requires-python = ">=3.10"
10+
license = "AGPL-3.0-or-later"
11+
license-files = ["LICENSE", "COPYRIGHT"]
1112
authors = [
1213
{name = "Dissect Team", email = "[email protected]"}
1314
]
@@ -16,7 +17,6 @@ classifiers = [
1617
"Environment :: Console",
1718
"Intended Audience :: Developers",
1819
"Intended Audience :: Information Technology",
19-
"License :: OSI Approved",
2020
"Operating System :: OS Independent",
2121
"Programming Language :: Python :: 3",
2222
"Topic :: Internet :: Log Analysis",
@@ -41,9 +41,29 @@ dev = [
4141
"dissect.util>=3.0.dev,<4.0.dev",
4242
]
4343

44+
[dependency-groups]
45+
test = [
46+
"pytest",
47+
]
48+
lint = [
49+
"ruff==0.13.1",
50+
"vermin",
51+
]
52+
build = [
53+
"build",
54+
]
55+
debug = [
56+
"ipdb",
57+
]
58+
dev = [
59+
{include-group = "test"},
60+
{include-group = "lint"},
61+
{include-group = "debug"},
62+
]
63+
4464
[tool.ruff]
4565
line-length = 120
46-
required-version = ">=0.9.0"
66+
required-version = ">=0.13.1"
4767

4868
[tool.ruff.format]
4969
docstring-code-format = true
@@ -92,9 +112,6 @@ ignore = ["E203", "B904", "UP024", "ANN002", "ANN003", "ANN204", "ANN401", "SIM1
92112
known-first-party = ["dissect.ole"]
93113
known-third-party = ["dissect"]
94114

95-
[tool.setuptools]
96-
license-files = ["LICENSE", "COPYRIGHT"]
97-
98115
[tool.setuptools.packages.find]
99116
include = ["dissect.*"]
100117

tox.ini

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ envlist = lint
44
# requires if they are not available on the host system. This requires the
55
# locally installed tox to have a minimum version 3.3.0. This means the names
66
# of the configuration options are still according to the tox 3.x syntax.
7-
minversion = 4.4.3
7+
minversion = 4.27.0
88
# This version of virtualenv will install setuptools version 68.2.2 and pip
99
# 23.3.1. These versions fully support python projects defined only through a
1010
# pyproject.toml file (PEP-517/PEP-518/PEP-621). This pip version also support
@@ -14,36 +14,34 @@ requires = virtualenv>=20.24.6
1414
[testenv]
1515
extras = dev
1616
deps =
17-
pytest
1817
pytest-cov
1918
coverage
19+
dependency_groups = test
2020
commands =
2121
pytest --basetemp="{envtmpdir}" {posargs:--color=yes --cov=dissect --cov-report=term-missing -v tests}
2222
coverage report
2323
coverage xml
2424

2525
[testenv:build]
2626
package = skip
27-
deps =
28-
build
27+
dependency_groups = build
2928
commands =
3029
pyproject-build
3130

3231
[testenv:fix]
3332
package = skip
34-
deps =
35-
ruff==0.9.2
33+
dependency_groups = lint
3634
commands =
35+
ruff check --fix dissect tests
3736
ruff format dissect tests
3837

3938
[testenv:lint]
4039
package = skip
41-
deps =
42-
ruff==0.9.2
43-
vermin
40+
dependency_groups = lint
4441
commands =
4542
ruff check dissect tests
46-
vermin -t=3.9- --no-tips --lint dissect tests
43+
ruff format --check dissect tests
44+
vermin -t=3.10- --no-tips --lint dissect tests
4745

4846
[testenv:docs-build]
4947
allowlist_externals = make

0 commit comments

Comments
 (0)