Skip to content

Commit ebf78aa

Browse files
stonebigstonebig
committed
have setup.py and __init__.py formated per black, change __version__
1 parent 1f916b4 commit ebf78aa

2 files changed

Lines changed: 66 additions & 40 deletions

File tree

‎setup.py‎

Lines changed: 65 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,16 @@ def get_package_data(name, extlist):
2323
"""Return data files for package *name* with extensions in *extlist*"""
2424
flist = []
2525
# Workaround to replace os.path.relpath (not available until Python 2.6):
26-
offset = len(name)+len(os.pathsep)
26+
offset = len(name) + len(os.pathsep)
2727
for dirpath, _dirnames, filenames in os.walk(name):
2828
for fname in filenames:
29-
if not fname.startswith('.') and osp.splitext(fname)[1] in extlist:
30-
flist.append(osp.join(dirpath, fname)[offset:])
29+
if (
30+
not fname.startswith('.')
31+
and osp.splitext(fname)[1] in extlist
32+
):
33+
flist.append(
34+
osp.join(dirpath, fname)[offset:]
35+
)
3136
return flist
3237

3338

@@ -45,43 +50,64 @@ def get_subpackages(name):
4550

4651
PROJECT_NAME = 'WinPython'
4752

48-
setup(name=NAME,
49-
version=__version__,
50-
description='%s distribution tools, including WPPM' % PROJECT_NAME,
51-
long_description=\
52-
"""%s is a portable distribution of the Python programming language
53+
setup(
54+
name=NAME,
55+
version=__version__,
56+
description='%s distribution tools, including WPPM'
57+
% PROJECT_NAME,
58+
long_description="""%s is a portable distribution of the Python programming language
5359
for Windows. It is a full-featured Python-based scientific environment, :
54-
including a package manager, WPPM.""" % PROJECT_NAME,
55-
download_url='%s/files/%s-%s.zip' % (__project_url__, NAME, __version__),
56-
author="Pierre Raybaut",
57-
author_email='pierre.raybaut@gmail.com',
58-
url=__project_url__,
59-
license='MIT',
60-
keywords='PyQt5 PyQt4 PySide',
61-
platforms=['any'],
62-
packages=get_subpackages(LIBNAME),
63-
package_data={LIBNAME:
64-
get_package_data(LIBNAME, ('.mo', '.svg', '.png', '.css',
65-
'.html', '.js', '.ini')), },
66-
# requires=["PyQt4 (>=4.5)"],
67-
scripts=[osp.join('scripts', fname) for fname in
68-
('register_python', 'register_python.bat')],
69-
# use setuptools functionalities
70-
entry_points={
60+
including a package manager, WPPM."""
61+
% PROJECT_NAME,
62+
download_url='%s/files/%s-%s.zip'
63+
% (__project_url__, NAME, __version__),
64+
author="Pierre Raybaut",
65+
author_email='pierre.raybaut@gmail.com',
66+
url=__project_url__,
67+
license='MIT',
68+
keywords='PyQt5 PyQt4 PySide',
69+
platforms=['any'],
70+
packages=get_subpackages(LIBNAME),
71+
package_data={
72+
LIBNAME: get_package_data(
73+
LIBNAME,
74+
(
75+
'.mo',
76+
'.svg',
77+
'.png',
78+
'.css',
79+
'.html',
80+
'.js',
81+
'.ini',
82+
),
83+
)
84+
},
85+
# requires=["PyQt4 (>=4.5)"],
86+
scripts=[
87+
osp.join('scripts', fname)
88+
for fname in (
89+
'register_python',
90+
'register_python.bat',
91+
)
92+
],
93+
# use setuptools functionalities
94+
entry_points={
7195
'console_scripts': [
7296
'wpcp = winpython.controlpanel:main',
7397
'wppm = winpython.wppm:main',
74-
]
75-
},
76-
classifiers=['License :: OSI Approved :: MIT License',
77-
'Operating System :: MacOS',
78-
'Operating System :: Microsoft :: Windows',
79-
'Operating System :: OS Independent',
80-
'Operating System :: POSIX',
81-
'Operating System :: Unix',
82-
'Programming Language :: Python :: 2.7',
83-
'Programming Language :: Python :: 3',
84-
'Development Status :: 5 - Production/Stable',
85-
'Topic :: Scientific/Engineering',
86-
'Topic :: Software Development :: Widget Sets'],
87-
)
98+
]
99+
},
100+
classifiers=[
101+
'License :: OSI Approved :: MIT License',
102+
'Operating System :: MacOS',
103+
'Operating System :: Microsoft :: Windows',
104+
'Operating System :: OS Independent',
105+
'Operating System :: POSIX',
106+
'Operating System :: Unix',
107+
'Programming Language :: Python :: 2.7',
108+
'Programming Language :: Python :: 3',
109+
'Development Status :: 5 - Production/Stable',
110+
'Topic :: Scientific/Engineering',
111+
'Topic :: Software Development :: Widget Sets',
112+
],
113+
)

‎winpython/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
OTHER DEALINGS IN THE SOFTWARE.
2929
"""
3030

31-
__version__ = '2.0.20190503'
31+
__version__ = '2.0.20190519'
3232
__license__ = __doc__
3333
__project_url__ = 'http://winpython.github.io/'

0 commit comments

Comments
 (0)