Skip to content

Commit 9611e6b

Browse files
committed
2 parents b21a8dd + 678e1a9 commit 9611e6b

8 files changed

+41
-197
lines changed

.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
repos:
22
- repo: https://github.com/psf/black
3-
rev: 19.10b0
3+
rev: stable
44
hooks:
55
- id: black
66

77
- repo: https://github.com/asottile/blacken-docs
8-
rev: v1.4.0
8+
rev: v1.8.0
99
hooks:
1010
- id: blacken-docs

azure-pipelines.yml

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ stages:
8989
tox -e release
9090
env:
9191
TWINE_PASSWORD: $(PyPI-token)
92+
GITHUB_TOKEN: $(Github-token)
9293
displayName: 'publish to PyPI'
9394
9495
condition: contains(variables['Build.SourceBranch'], 'tags')

docs/refresh.svg

-193
This file was deleted.

pyproject.toml

+14
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,17 @@ build-backend = "setuptools.build_meta"
66
skip-string-normalization = true
77

88
[tool.setuptools_scm]
9+
10+
# jaraco/skeleton#22
11+
[tool.jaraco.pytest.plugins.black]
12+
addopts = "--black"
13+
14+
# jaraco/skeleton#22
15+
[tool.jaraco.pytest.plugins.mypy]
16+
addopts = "--mypy"
17+
18+
[tool.jaraco.pytest.plugins.flake8]
19+
addopts = "--flake8"
20+
21+
[tool.jaraco.pytest.plugins.cov]
22+
addopts = "--cov"

pytest.ini

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[pytest]
2+
norecursedirs=dist build .tox .eggs
3+
addopts=--doctest-modules
4+
doctest_optionflags=ALLOW_UNICODE ELLIPSIS
5+
# workaround for warning pytest-dev/pytest#6178
6+
junit_family=xunit2
7+
filterwarnings=
8+
# https://github.com/pytest-dev/pytest/issues/6928
9+
ignore:direct construction of .*Item has been deprecated:DeprecationWarning

setup.cfg

+8
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ setup_requires = setuptools_scm[toml] >= 3.4.1
2424
[options.extras_require]
2525
testing =
2626
# upstream
27+
pytest >= 3.5, !=3.7.3
28+
pytest-checkdocs >= 1.2.3
29+
pytest-flake8
30+
pytest-black >= 0.3.7; python_implementation != "PyPy"
31+
pytest-cov
32+
pytest-mypy; python_implementation != "PyPy"
33+
# jaraco/skeleton#22
34+
jaraco.test >= 3.2.0
2735

2836
# local
2937
jaraco.itertools

skeleton.md

+4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ The `--allow-unrelated-histories` is necessary because the history from the skel
4040

4141
Whenever a change is needed or desired for the general technique for packaging, it can be made in the skeleton project and then merged into each of the derived projects as needed, recommended before each release. As a result, features and best practices for packaging are centrally maintained and readily trickle into a whole suite of packages. This technique lowers the amount of tedious work necessary to create or maintain a project, and coupled with other techniques like continuous integration and deployment, lowers the cost of creating and maintaining refined Python projects to just a few, familiar Git operations.
4242

43+
For example, here's a session of the [path project](https://pypi.org/project/path) pulling non-conflicting changes from the skeleton:
44+
45+
<img src="https://raw.githubusercontent.com/jaraco/skeleton/gh-pages/docs/refresh.svg">
46+
4347
Thereafter, the target project can make whatever customizations it deems relevant to the scaffolding. The project may even at some point decide that the divergence is too great to merit renewed merging with the original skeleton. This approach applies maximal guidance while creating minimal constraints.
4448

4549
# Features

tox.ini

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ tox_pip_extensions_ext_venv_update = true
77

88
[testenv]
99
deps =
10-
# workaround for python/mypy#8627
11-
mypy@git+https://github.com/python/mypy
1210
commands =
1311
python -m unittest discover
1412
usedevelop = True
@@ -28,11 +26,14 @@ deps =
2826
pep517>=0.5
2927
twine[keyring]>=1.13
3028
path
29+
jaraco.develop>=7.1
3130
passenv =
3231
TWINE_PASSWORD
32+
GITHUB_TOKEN
3333
setenv =
3434
TWINE_USERNAME = {env:TWINE_USERNAME:__token__}
3535
commands =
3636
python -c "import path; path.Path('dist').rmtree_p()"
3737
python -m pep517.build .
3838
python -m twine upload dist/*
39+
python -m jaraco.develop.create-github-release

0 commit comments

Comments
 (0)