Skip to content

Commit 1df7751

Browse files
authored
Merge pull request #37 from ewenmcneill/setup-description
setup.py: generate single line description=
2 parents 74ae5c0 + 4f9064a commit 1df7751

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@ stages:
2828
install:
2929
- git fetch --tags
3030
- cd programmer
31+
- pip install --upgrade pip
3132
- pip install --upgrade tox
33+
- pip install --upgrade setuptools
3234
- pip install --upgrade setuptools_scm
35+
- pip install --upgrade wheel
36+
- pip install --upgrade twine
3337

3438
script:
3539
- tox

programmer/setup.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
with open("README.md", "rb") as fh:
1919
long_description = fh.read().decode('utf-8')
2020

21+
short_description = """
22+
Programmer for FPGA boards using the TinyFPGA USB Bootloader
23+
(http://tinyfpga.com).
24+
""".replace("\n", "").replace("\r", "").strip()
25+
# short description should not have newlines or start/ending spaces.
26+
assert len(short_description.splitlines()) == 1
27+
2128
setup(
2229
name='tinyprog',
2330
packages=find_packages(),
@@ -31,10 +38,7 @@
3138
'git_describe_command': GIT_DESCRIBE_CMD,
3239
},
3340
setup_requires=['setuptools_scm'],
34-
description="""\
35-
Programmer for FPGA boards using the TinyFPGA USB Bootloader
36-
(http://tinyfpga.com).
37-
""",
41+
description=short_description,
3842
long_description=long_description,
3943
long_description_content_type="text/markdown",
4044
author='Luke Valenty',
@@ -56,10 +60,10 @@
5660
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
5761
'Programming Language :: Python :: 2',
5862
'Programming Language :: Python :: 2.7',
59-
'Programming Language :: Python :: 3'
60-
'Programming Language :: Python :: 3.5'
61-
'Programming Language :: Python :: 3.6'
62-
'Programming Language :: Python :: 3.7'
63+
'Programming Language :: Python :: 3',
64+
'Programming Language :: Python :: 3.5',
65+
'Programming Language :: Python :: 3.6',
66+
'Programming Language :: Python :: 3.7',
6367
],
6468
entry_points={'console_scripts': ['tinyprog = tinyprog.__main__:main']},
6569
)

0 commit comments

Comments
 (0)