Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

setup.py: generate single line description= #37

Merged
merged 3 commits into from
Jan 17, 2019

Conversation

ewenmcneill
Copy link
Contributor

@mithro, the Summary: field (from description=) needs to be a single line, so
replace newlines with spaces, and strip trailing white space.

Existing PyPI PKG-INFO has:

ewen@parthenon:/tmp/tinyprog-dev/EGG-INFO$ head -8 PKG-INFO 
Metadata-Version: 2.1
Name: tinyprog
Version: 1.0.24.dev16
Summary: Programmer for FPGA boards using the TinyFPGA USB Bootloader
(http://tinyfpga.com).

Home-page: https://github.com/tinyfpga/TinyFPGA-Bootloader/
Author: Luke Valenty
ewen@parthenon:/tmp/tinyprog-dev/EGG-INFO$ 

but AFAICT we need:

ewen@parthenon:/tmp/tinyprog/tinyprog-1.0.24.dev15+g74ae5c0.d20190118$ head -8 PKG-INFO 
Metadata-Version: 2.1
Name: tinyprog
Version: 1.0.24.dev15+g74ae5c0.d20190118
Summary: Programmer for FPGA boards using the TinyFPGA USB Bootloader (http://tinyfpga.com).
Home-page: https://github.com/tinyfpga/TinyFPGA-Bootloader/
Author: Luke Valenty
Author-email: luke@tinyfpga.com
License: GPLv3+
ewen@parthenon:/tmp/tinyprog/tinyprog-1.0.24.dev15+g74ae5c0.d20190118$ 

as generated when we strip out these stray newlines in the description= values.

python setup.py sdist seems to produce sensible looking PKG-INFO now, but I've obviously not tried uploading this to PyPI. At minimum I think it should be better than now.

Ewen

@mithro mithro force-pushed the setup-description branch 2 times, most recently from 5929d76 to 0a2efbd Compare January 17, 2019 23:14
@mithro
Copy link
Collaborator

mithro commented Jan 17, 2019

@mithro
Copy link
Collaborator

mithro commented Jan 17, 2019

I tried to be clever and it backfired. Trying again at https://travis-ci.com/mithro/TinyFPGA-Bootloader/builds/97766679

@mithro
Copy link
Collaborator

mithro commented Jan 17, 2019

Ha... HTTPError: 400 Client Error: Invalid value for classifiers. Error: 'Programming Language :: Python :: 3Programming Language :: Python :: 3.5Programming Language :: Python :: 3.6Programming Language :: Python :: 3.7' is not a valid choice for this field for url: https://upload.pypi.org/legacy/

@mithro
Copy link
Collaborator

mithro commented Jan 17, 2019

@mithro
Copy link
Collaborator

mithro commented Jan 17, 2019

The output looks better -> https://pypi.org/project/tinyprog/1.0.24.dev17/

ewenmcneill and others added 2 commits January 18, 2019 12:29
The Summary: field (from description=) needs to be a single line, so
replace newlines with spaces, and strip trailing white space.
@mithro
Copy link
Collaborator

mithro commented Jan 17, 2019

Ahh, you don't have my newer setuptools...

@mithro
Copy link
Collaborator

mithro commented Jan 17, 2019

This now works! https://pypi.org/project/tinyprog/1.0.24.dev18/

@mithro mithro merged commit 1df7751 into tinyfpga:master Jan 17, 2019
@ewenmcneill ewenmcneill deleted the setup-description branch January 17, 2019 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants