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.

Sign up for GitHub

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

Jump to bottom

Add setup() args for new pypi.org #357

Merged
merged 5 commits into from
Mar 12, 2018
Merged

Add setup() args for new pypi.org #357

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac9c2e9
Add metadata for new pypi.org
willingc Mar 11, 2018
bcede57
Changes from @takluyver @minrk review
willingc Mar 12, 2018
f498173
Fix OS classifier
willingc Mar 12, 2018
bad02e9
Fix Python version
willingc Mar 12, 2018
08a9f65
one more time
willingc Mar 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,29 @@ def run(self):
name = name,
version = version_ns['__version__'],
packages = packages,
description = "Jupyter protocol implementation and client libraries",
description = 'Jupyter protocol implementation and client libraries',
author = 'Jupyter Development Team',
author_email = 'jupyter@googlegroups.com',
url = 'https://jupyter.org',
license = 'BSD',
platforms = "Linux, Mac OS X, Windows",
keywords = ['Interactive', 'Interpreter', 'Shell', 'Web'],
project_urls = {
'Documentation': 'https://jupyter-client.readthedocs.io',
'Source': 'https://github.com/jupyter/jupyter_client/',
'Tracker': 'https://github.com/jupyter/jupyter_client/issues',
},
classifiers = [
'Framework :: Jupyter',
'Intended Audience :: Developers',
'Intended Audience :: Education',
'Intended Audience :: System Administrators',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
],
install_requires = [
'traitlets',
Expand All @@ -85,6 +92,7 @@ def run(self):
'entrypoints',
'tornado>=4.1',
],
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, <=4',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove <=4. The rest is already correctly limiting to 2.7, 3.3+. This should be:

python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*',

adding >=3.3 would exclude 2.7, since all of these conditions are AND-ed together.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I need more coffee.

extras_require = {
'test': ['ipykernel', 'ipython', 'mock'],
'test:python_version == "3.3"': ['pytest<3.3.0'],
Expand Down