Skip to content

Commit c713bbc

Browse files
bhrutledgebhrutledge
committed
Merge remote-tracking branch 'upstream/master' into mypy-coverage
2 parents 8b827b4 + 031d722 commit c713bbc

File tree

4 files changed

+55
-63
lines changed

4 files changed

+55
-63
lines changed

‎setup.cfg

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,55 @@
11
[metadata]
22
license_file = LICENSE
3+
name = twine
4+
version = 2.0.0
5+
author = Donald Stufft and individual contributors
6+
author_email = [email protected]
7+
description = Collection of utilities for publishing packages on PyPI
8+
long_description = file:README.rst
9+
url = https://twine.readthedocs.io/
10+
project_urls =
11+
Packaging tutorial = https://packaging.python.org/tutorials/distributing-packages/
12+
Travis CI = https://travis-ci.org/pypa/twine/
13+
Twine documentation = https://twine.readthedocs.io/en/latest/
14+
Twine source = https://github.com/pypa/twine/
15+
classifiers =
16+
Intended Audience :: Developers
17+
License :: OSI Approved :: Apache Software License
18+
Natural Language :: English
19+
Operating System :: MacOS :: MacOS X
20+
Operating System :: POSIX
21+
Operating System :: POSIX :: BSD
22+
Operating System :: POSIX :: Linux
23+
Operating System :: Microsoft :: Windows
24+
Programming Language :: Python
25+
Programming Language :: Python :: 3
26+
Programming Language :: Python :: 3 :: Only
27+
Programming Language :: Python :: 3.6
28+
Programming Language :: Python :: 3.7
29+
Programming Language :: Python :: 3.8
30+
Programming Language :: Python :: Implementation :: CPython
31+
32+
[options]
33+
packages =
34+
twine
35+
twine.commands
36+
python_requires = >=3.6
37+
install_requires=
38+
pkginfo >= 1.4.2
39+
readme_renderer >= 21.0
40+
requests >= 2.20
41+
requests-toolbelt >= 0.8.0, != 0.9.0
42+
setuptools >= 0.7.0
43+
tqdm >= 4.14
44+
importlib_metadata; python_version < "3.8"
45+
keyring >= 15.1
46+
setup_requires =
47+
setuptools_scm >= 1.15
48+
49+
[options.entry_points]
50+
twine.registered_commands =
51+
check = twine.commands.check:main
52+
upload = twine.commands.upload:main
53+
register = twine.commands.register:main
54+
console_scripts =
55+
twine = twine.__main__:main

‎setup.py

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -15,65 +15,4 @@
1515

1616

1717
setup(
18-
name="twine",
19-
version="2.0.0",
20-
21-
description="Collection of utilities for publishing packages on PyPI",
22-
long_description=open("README.rst").read(),
23-
url="https://twine.readthedocs.io/",
24-
project_urls={
25-
'Packaging tutorial': 'https://packaging.python.org/tutorials/distributing-packages/',
26-
'Travis CI': 'https://travis-ci.org/pypa/twine',
27-
'Twine documentation': 'https://twine.readthedocs.io/en/latest/',
28-
'Twine source': 'https://github.com/pypa/twine/',
29-
},
30-
31-
author="Donald Stufft and individual contributors",
32-
author_email="[email protected]",
33-
34-
classifiers=[
35-
"Intended Audience :: Developers",
36-
"License :: OSI Approved :: Apache Software License",
37-
"Natural Language :: English",
38-
"Operating System :: MacOS :: MacOS X",
39-
"Operating System :: POSIX",
40-
"Operating System :: POSIX :: BSD",
41-
"Operating System :: POSIX :: Linux",
42-
"Operating System :: Microsoft :: Windows",
43-
"Programming Language :: Python",
44-
"Programming Language :: Python :: 3",
45-
"Programming Language :: Python :: 3 :: Only",
46-
"Programming Language :: Python :: 3.6",
47-
"Programming Language :: Python :: 3.7",
48-
"Programming Language :: Python :: 3.8",
49-
"Programming Language :: Python :: Implementation :: CPython",
50-
],
51-
52-
packages=["twine", "twine.commands"],
53-
54-
entry_points={
55-
"twine.registered_commands": [
56-
"check = twine.commands.check:main",
57-
"upload = twine.commands.upload:main",
58-
"register = twine.commands.register:main",
59-
],
60-
"console_scripts": [
61-
"twine = twine.__main__:main",
62-
],
63-
},
64-
65-
python_requires=">=3.6",
66-
install_requires=[
67-
"pkginfo >= 1.4.2",
68-
"readme_renderer >= 21.0",
69-
"requests >= 2.20",
70-
"requests-toolbelt >= 0.8.0, != 0.9.0",
71-
"setuptools >= 0.7.0",
72-
"tqdm >= 4.14",
73-
'importlib_metadata; python_version<"3.8"',
74-
"keyring >= 15.1",
75-
],
76-
setup_requires=[
77-
'setuptools_scm>=1.15',
78-
],
7918
)

‎tests/test_repository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def progressbarstub(*args, **kwargs):
165165
repository_url=DEFAULT_REPOSITORY,
166166
username='username',
167167
password='password',
168-
disable_progress_bar=disable_progress_bar
168+
disable_progress_bar=disable_progress_bar,
169169
)
170170

171171
repo.session = pretend.stub(

‎twine/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ def create_repository(self) -> repository.Repository:
332332
cast(str, self.repository_config['repository']),
333333
self.username,
334334
self.password,
335-
self.disable_progress_bar
335+
self.disable_progress_bar,
336336
)
337337
repo.set_certificate_authority(self.cacert)
338338
repo.set_client_certificate(self.client_cert)

0 commit comments

Comments
 (0)