From f59f536f87178279f09fcde708c2a20ac933b2c7 Mon Sep 17 00:00:00 2001 From: Peter Bittner Date: Mon, 1 Oct 2018 13:01:52 +0200 Subject: [PATCH 1/2] Update classifiers, make README display correctly on PyPI --- pythonturtle/__init__.py | 4 ++-- pythonturtle/application.py | 2 +- setup.py | 15 +++++++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pythonturtle/__init__.py b/pythonturtle/__init__.py index 579d744..5d062df 100644 --- a/pythonturtle/__init__.py +++ b/pythonturtle/__init__.py @@ -9,7 +9,7 @@ demonstrates how to move the turtle and introduces the student to the basics of Python programming. """ +name = 'PythonTurtle' +__version__ = '0.3.3' __license__ = 'MIT' -__product_name__ = 'PythonTurtle' __url__ = 'http://pythonturtle.org' -__version__ = '0.3.0' diff --git a/pythonturtle/application.py b/pythonturtle/application.py index e164b75..03b0e60 100644 --- a/pythonturtle/application.py +++ b/pythonturtle/application.py @@ -207,7 +207,7 @@ def init_about_dialog_info(self): info.SetDescription(description) info.SetLicence(license_terms) info.SetCopyright(license_copyright) - info.SetName(pythonturtle.__product_name__) + info.SetName(pythonturtle.name) info.SetVersion(pythonturtle.__version__) info.SetWebSite(pythonturtle.__url__) info.SetDevelopers(developer_list) diff --git a/setup.py b/setup.py index 2989fdb..15deb58 100755 --- a/setup.py +++ b/setup.py @@ -15,18 +15,25 @@ def read_file(filename): setup( - name=package.__name__, + name=package.name, version=package.__version__, - description=package.__doc__, + description=package.__doc__.strip(), long_description=read_file('README.md'), long_description_content_type='text/markdown', classifiers=[ 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', + 'Environment :: MacOS X', + 'Environment :: Win32 (MS Windows)', + 'Environment :: X11 Applications :: GTK', + 'Intended Audience :: Education', 'License :: OSI Approved :: MIT License', - 'Operating System :: OS Independent', + 'Operating System :: MacOS', + 'Operating System :: Microsoft :: Windows', + 'Operating System :: POSIX :: Linux', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Topic :: Education', ], keywords=['turtle', 'learning', 'children', 'beginners', 'logo '], author='Ram Rachum', From 11000d6690d472bdf8abf0d3b3a1c940c144e95d Mon Sep 17 00:00:00 2001 From: Peter Bittner Date: Mon, 1 Oct 2018 15:47:17 +0200 Subject: [PATCH 2/2] Fix broken PyPI project description (short descr must be a single line) --- pythonturtle/__init__.py | 2 +- setup.py | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pythonturtle/__init__.py b/pythonturtle/__init__.py index 5d062df..a3c697f 100644 --- a/pythonturtle/__init__.py +++ b/pythonturtle/__init__.py @@ -10,6 +10,6 @@ basics of Python programming. """ name = 'PythonTurtle' -__version__ = '0.3.3' +__version__ = '0.3.0' __license__ = 'MIT' __url__ = 'http://pythonturtle.org' diff --git a/setup.py b/setup.py index 15deb58..77d99e6 100755 --- a/setup.py +++ b/setup.py @@ -17,9 +17,17 @@ def read_file(filename): setup( name=package.name, version=package.__version__, - description=package.__doc__.strip(), - long_description=read_file('README.md'), + license=package.__license__, + author='Ram Rachum', + author_email='ram@rachum.com', + description=package.__doc__.strip().split('\n')[0], long_description_content_type='text/markdown', + long_description=read_file('README.md'), + url=package.__url__, + project_urls={ + 'Source': 'https://github.com/cool-RR/PythonTurtle', + }, + keywords=['turtle', 'learning', 'children', 'beginners', 'logo '], classifiers=[ 'Development Status :: 5 - Production/Stable', 'Environment :: MacOS X', @@ -35,16 +43,12 @@ def read_file(filename): 'Programming Language :: Python :: 3.7', 'Topic :: Education', ], - keywords=['turtle', 'learning', 'children', 'beginners', 'logo '], - author='Ram Rachum', - author_email='ram@rachum.com', - url=package.__url__, - license=package.__license__, + python_requires='>=3', packages=find_packages(exclude=['tests']), include_package_data=True, + zip_safe=True, # install_requires=['wxPython'], tests_require=['tox'], - zip_safe=True, entry_points={ 'console_scripts': [ 'PythonTurtle = pythonturtle.__main__:run',