Skip to content

Commit 378895e

Browse files
committed
2 parents d2ae3cd + 14312a5 commit 378895e

File tree

4 files changed

+49
-32
lines changed

4 files changed

+49
-32
lines changed

.editorconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
indent_style = tab
6+
indent_size = 4
7+
insert_final_newline = true
8+
end_of_line = lf
9+
10+
[*.py]
11+
indent_style = space
12+
13+
[*.{yml,yaml}]
14+
indent_style = space
15+
indent_size = 2

pytest.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ doctest_optionflags=ALLOW_UNICODE ELLIPSIS
88
# workaround for warning pytest-dev/pytest#6178
99
junit_family=xunit2
1010
filterwarnings=
11-
# https://github.com/pytest-dev/pytest/issues/6928
12-
ignore:direct construction of .*Item has been deprecated:DeprecationWarning
1311
# Fail on warnings
1412
error
1513
# https://github.com/pypa/setuptools/issues/1823

setup.cfg

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
license_files =
3-
LICENSE
3+
LICENSE
44
name = setuptools
55
version = 54.1.1
66
author = Python Packaging Authority
@@ -14,13 +14,13 @@ classifiers =
1414
License :: OSI Approved :: MIT License
1515
Programming Language :: Python :: 3
1616
Programming Language :: Python :: 3 :: Only
17-
Topic :: Software Development :: Libraries :: Python Modules
18-
Topic :: System :: Archiving :: Packaging
19-
Topic :: System :: Systems Administration
20-
Topic :: Utilities
17+
Topic :: Software Development :: Libraries :: Python Modules
18+
Topic :: System :: Archiving :: Packaging
19+
Topic :: System :: Systems Administration
20+
Topic :: Utilities
2121
keywords = CPAN PyPI distutils eggs package management
2222
project_urls =
23-
Documentation = https://setuptools.readthedocs.io/
23+
Documentation = https://setuptools.readthedocs.io/
2424

2525
[options]
2626
packages = find_namespace:
@@ -31,52 +31,56 @@ install_requires =
3131

3232
[options.packages.find]
3333
exclude =
34-
build*
35-
docs*
36-
tests*
37-
*.tests
38-
tools*
34+
build*
35+
dist*
36+
docs*
37+
tests*
38+
*.tests
39+
tools*
3940

4041
[options.extras_require]
4142
testing =
4243
# upstream
43-
pytest >= 3.5, !=3.7.3
44+
pytest >= 4.6
4445
pytest-checkdocs >= 2.4
4546
pytest-flake8
47+
# python_implementation: workaround for jaraco/skeleton#22
4648
pytest-black >= 0.3.7; python_implementation != "PyPy"
4749
pytest-cov
48-
pytest-mypy; python_implementation != "PyPy"
50+
# python_implementation: workaround for jaraco/skeleton#22
51+
# python_version: workaround for python/typed_ast#156
52+
pytest-mypy; python_implementation != "PyPy" and python_version < "3.10"
4953
pytest-enabler >= 1.0.1
5054

5155
# local
52-
mock
53-
flake8-2020
54-
virtualenv>=13.0.0
55-
pytest-virtualenv>=1.2.7
56-
wheel
57-
paver
58-
pip>=19.1 # For proper file:// URLs support.
59-
jaraco.envs
60-
pytest-xdist
61-
sphinx
62-
jaraco.path>=3.2.0
56+
mock
57+
flake8-2020
58+
virtualenv>=13.0.0
59+
pytest-virtualenv>=1.2.7
60+
wheel
61+
paver
62+
pip>=19.1 # For proper file:// URLs support.
63+
jaraco.envs
64+
pytest-xdist
65+
sphinx
66+
jaraco.path>=3.2.0
6367

6468
docs =
65-
# Keep these in sync with docs/requirements.txt
69+
# Keep these in sync with docs/requirements.txt
6670
# upstream
6771
sphinx
6872
jaraco.packaging >= 8.2
6973
rst.linker >= 1.9
70-
sphinx-inline-tabs
74+
sphinx-inline-tabs
7175

7276
# local
73-
pygments-github-lexers==0.0.5
77+
pygments-github-lexers==0.0.5
7478

7579
ssl =
76-
wincertstore==0.2; sys_platform=='win32'
80+
wincertstore==0.2; sys_platform=='win32'
7781

7882
certs =
79-
certifi==2016.9.26
83+
certifi==2016.9.26
8084

8185
[options.entry_points]
8286

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ commands =
5353
skip_install = True
5454
deps =
5555
build
56-
twine[keyring]>=1.13
56+
twine>=3
5757
path
5858
jaraco.develop>=7.1
5959
jaraco.tidelift

0 commit comments

Comments
 (0)