Skip to content

Commit 98f666a

Browse files
committed
Merge latest skeleton
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
2 parents 148aae9 + 6450529 commit 98f666a

File tree

8 files changed

+34
-13
lines changed

8 files changed

+34
-13
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,4 @@ tcl
7373
# Ignore Jupyter Notebook related temp files
7474
.ipynb_checkpoints/
7575
/.ruff_cache/
76+
.env

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ python:
2626
- method: pip
2727
path: .
2828
extra_requirements:
29-
- docs
29+
- dev

MANIFEST.in

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
11
graft src
2+
graft docs
3+
graft etc
24

35
include *.LICENSE
46
include NOTICE
57
include *.ABOUT
68
include *.toml
79
include *.yml
810
include *.rst
11+
include *.png
912
include setup.*
1013
include configure*
1114
include requirements*
12-
include .git*
15+
include .dockerignore
16+
include .gitignore
17+
include .readthedocs.yml
18+
include manage.py
19+
include Dockerfile*
20+
include Makefile
21+
include MANIFEST.in
1322

14-
global-exclude *.py[co] __pycache__ *.*~
23+
include .VERSION
1524

25+
global-exclude *.py[co] __pycache__ *.*~

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,13 @@ PYTHON_EXE?=python3
1313
VENV=venv
1414
ACTIVATE?=. ${VENV}/bin/activate;
1515

16+
17+
conf:
18+
@echo "-> Install dependencies"
19+
./configure
20+
1621
dev:
17-
@echo "-> Configure the development envt."
22+
@echo "-> Configure and install development dependencies"
1823
./configure --dev
1924

2025
doc8:

configure

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ CLI_ARGS=$1
2929

3030
# Requirement arguments passed to pip and used by default or with --dev.
3131
REQUIREMENTS="--editable . --constraint requirements.txt"
32-
DEV_REQUIREMENTS="--editable .[testing] --constraint requirements.txt --constraint requirements-dev.txt"
32+
DEV_REQUIREMENTS="--editable .[dev] --constraint requirements.txt --constraint requirements-dev.txt"
3333

3434
# where we create a virtualenv
3535
VIRTUALENV_DIR=venv
3636

3737
# Cleanable files and directories to delete with the --clean option
38-
CLEANABLE="build dist venv .cache .eggs"
38+
CLEANABLE="build dist venv .cache .eggs *.egg-info docs/_build/ pip-selfcheck.json"
3939

4040
# extra arguments passed to pip
4141
PIP_EXTRA_ARGS=" "
@@ -167,6 +167,7 @@ clean() {
167167
for cln in $CLEANABLE;
168168
do rm -rf "${CFG_ROOT_DIR:?}/${cln:?}";
169169
done
170+
find . -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete
170171
set +e
171172
exit
172173
}

configure.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
@rem # Requirement arguments passed to pip and used by default or with --dev.
2929
set "REQUIREMENTS=--editable . --constraint requirements.txt"
30-
set "DEV_REQUIREMENTS=--editable .[testing] --constraint requirements.txt --constraint requirements-dev.txt"
30+
set "DEV_REQUIREMENTS=--editable .[dev] --constraint requirements.txt --constraint requirements-dev.txt"
3131

3232
@rem # where we create a virtualenv
3333
set "VIRTUALENV_DIR=venv"

pyproject.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ norecursedirs = [
1414
"dist",
1515
"build",
1616
"_build",
17-
"dist",
1817
"etc",
1918
"local",
2019
"ci",
@@ -34,7 +33,9 @@ norecursedirs = [
3433
"thirdparty",
3534
"tmp",
3635
"venv",
36+
".venv",
3737
"tests/data",
38+
"*/tests/test_data",
3839
".eggs",
3940
"src/*/data",
4041
"tests/*/data"
@@ -65,6 +66,7 @@ include = [
6566
"docs/**/*.py",
6667
"*.py",
6768
"."
69+
6870
]
6971
# ignore test data and testfiles: they should never be linted nor formatted
7072
exclude = [
@@ -77,11 +79,12 @@ exclude = [
7779
# vulnerablecode, fetchcode
7880
"**/tests/*/test_data/**/*",
7981
"**/tests/test_data/**/*",
82+
# django migrations
83+
"**/migrations/**/*",
8084
# exclude vendored code from ScanCode
8185
"src/_packagedcode",
8286
]
8387

84-
8588
[tool.ruff.lint]
8689
# Rules: https://docs.astral.sh/ruff/rules/
8790
select = [

setup.cfg

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,11 @@ license_files =
4141
AUTHORS.rst
4242
CHANGELOG.rst
4343
CODE_OF_CONDUCT.rst
44+
README.rst
4445

4546
[options]
47+
python_requires = >=3.9
48+
4649
package_dir =
4750
=src
4851
packages = find:
@@ -51,7 +54,6 @@ zip_safe = false
5154

5255
setup_requires = setuptools_scm[toml] >= 4
5356

54-
python_requires = >=3.8
5557

5658
install_requires =
5759
attrs >= 18.1, !=20.1.0
@@ -78,11 +80,10 @@ console_scripts =
7880
python-inspector = python_inspector.resolve_cli:resolve_dependencies
7981

8082
[options.extras_require]
81-
testing =
82-
pytest >= 6, != 7.0.0
83+
dev =
84+
pytest >= 7.0.1
8385
pytest-xdist >= 2
8486
aboutcode-toolkit >= 7.0.2
85-
pycodestyle >= 2.8.0
8687
twine
8788
ruff
8889
pytest-rerunfailures

0 commit comments

Comments
 (0)