minor changes in order to fix publishing dist on new PiPy

Author: markuskiller

HISTORY.rst

@@ -1,13 +1,14 @@
 Changelog
 ---------
 
-0.4.3 (02/01/2019)
+0.4.3 (03/01/2019)
 ++++++++++++++++++
 
 * Added support for Python3.7 (``StopIteration --> return``) `Pull Request #18 <https://github.com/markuskiller/textblob-de/pull/18>`_ (thanks @andrewmfiorillo)
 * Fixed tests for Google translation examples
 * Updated tox/Travis-CI config files to include latest Python & pypy versions
 * Updated sphinx_rtd_theme to version 0.4.2 to fix rendering problems on `RTD <http://textblob-de.readthedocs.org>`_
+* Updated ``setup.py publish`` commands, ``Makefile`` & ``Manifest.in`` to new PiPy (using ``twine``)
 
 0.4.2 (02/05/2015)
 ++++++++++++++++++

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2019 Markus Killer
+Copyright 2014-2019 Markus Killer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MANIFEST.in

@@ -4,6 +4,8 @@ recursive-include textblob_de/data *.xml
 recursive-exclude textblob_de/ext __pycache__ *.pyc
 recursive-include tests *
 recursive-include docs *
-exclude docs/src/_build
+prune docs/src/_build
+prune docs/src/_themes
+prune docs/html/_static/fonts
 recursive-exclude docs __pycache__ *.pyc
 recursive-exclude tests __pycache__ *.pyc

Makefile

@@ -15,8 +15,8 @@ P = python
 # Linux 'open' or 'xdg-open' / OSX: 'open' / Win: 'start'
 
 #O = start
-O = xdg-open
-#O = open
+#O = xdg-open
+O = open
 
 
 help:
@@ -53,6 +53,7 @@ help:
 	@echo "docs-pdf           generate Sphinx HTML and PDF documentation, including API docs"
 	@echo "sdist              package"
 	@echo "publish            package and upload sdist and universal wheel to PyPI"
+	@echo "publish-test       package and upload sdist and universal wheel to PyPI"
 	@echo "register           update README.rst on PyPI"
 	@echo "push-github        push all changes to git repository on github.com"
 	@echo "push-bitbucket     push all changes to git repository on bitbucket.org"
@@ -151,12 +152,17 @@ docs: clean develop
 
 
 docs-pdf: docs
-	make -C ./docs/src latexpdf
+	#make -C ./docs/src latexpdf
 	#$(O) ./docs/$(subst _,-,$(N)).pdf &
+	curl https://media.readthedocs.org/pdf/textblob-de/stable/textblob-de.pdf --output docs/textblob-de.pdf
 
 publish: clean docs-pdf
 	$(P) setup.py publish
 	$(O) https://pypi.python.org/pypi/$(subst _,-,$(N)) &
+	
+publish-test: clean docs-pdf
+	$(P) setup.py publish_test
+	$(O) https://test.pypi.org/project/$(subst _,-,$(N)) &
 
 sdist: clean docs-pdf
 	$(P) setup.py sdist

README.md

@@ -184,12 +184,13 @@ TODO
 License
 -------
 
-[MIT licensed](http://choosealicense.com/licenses/mit/). See the bundled
-`LICENSE` file for more details.
+MIT licensed. See the bundled
+[LICENSE](https://github.com/markuskiller/textblob-de/blob/master/LICENSE)
+file for more details.
 
 Thanks
 ------
 
-Coded with Wing IDE 5.0 (free open source developer license)
+Coded with Wing IDE (free open source developer license)
 
 [![Python IDE for Python - wingware.com](https://wingware.com/images/wingware-logo-180x58.png)](https://wingware.com/store/free)

README.rst

@@ -196,13 +196,13 @@ TODO
 License
 -------
 
-`MIT licensed <http://choosealicense.com/licenses/mit/>`_. See the bundled ``LICENSE``  file for more details.
+MIT licensed. See the bundled `LICENSE <https://github.com/markuskiller/textblob-de/blob/master/LICENSE>`_ file for more details.
 
 
 Thanks
 ------
 
-Coded with Wing IDE 5.0 (free open source developer license)
+Coded with Wing IDE (free open source developer license)
 
 .. image:: https://wingware.com/images/wingware-logo-180x58.png
     :target: https://wingware.com/store/free

docs/src/docs_makefile.rst

@@ -4,7 +4,7 @@ Documentation ``Makefile``
 
     ::
 
-     generated: 02 January 2019 - 15:56
+     generated: 03 January 2019 - 00:50
 
 	Please use `make <target>' where <target> is one of
 

docs/src/project_makefile.rst

@@ -4,7 +4,7 @@ Project ``Makefile``
 
     ::
 
-     generated: 02 January 2019 - 15:56
+     generated: 03 January 2019 - 00:50
 
 	
 	Please use 'make <target>' where where <target> is one of
@@ -39,6 +39,7 @@ Project ``Makefile``
 	docs-pdf           generate Sphinx HTML and PDF documentation, including API docs
 	sdist              package
 	publish            package and upload sdist and universal wheel to PyPI
+	publish-test       package and upload sdist and universal wheel to PyPI
 	register           update README.rst on PyPI
 	push-github        push all changes to git repository on github.com
 	push-bitbucket     push all changes to git repository on bitbucket.org

setup.py

@@ -18,8 +18,10 @@
 
 
 BUILD_CMD = "python setup.py sdist bdist_wheel"
-PUBLISH_CMD = "twine check register upload dist/*"
-TEST_PUBLISH_CMD = 'python setup.py register -r test sdist bdist_wheel upload -r test'
+CHECK_DIST_CMD = "twine check dist/*"
+PUBLISH_CMD = "twine upload dist/*"
+REGISTER_CMD = "twine register textblob-de"
+TEST_PUBLISH_CMD = 'twine upload --repository-url https://test.pypi.org/legacy/ dist/*'
 TEST_CMD = 'python run_tests.py'
 
 
@@ -55,6 +57,7 @@ def find_version(fname):
         print("twine required. Run `pip install twine`.")
         sys.exit(1)
     build = subprocess.call(BUILD_CMD, shell=True)
+    check_dist = subprocess.call(CHECK_DIST_CMD, shell=True)
     status = subprocess.call(PUBLISH_CMD, shell=True)
     sys.exit(status)
 
@@ -64,8 +67,24 @@ def find_version(fname):
     except ImportError:
         print("wheel required. Run `pip install wheel`.")
         sys.exit(1)
+    try:
+        __import__('twine')
+    except ImportError:
+        print("twine required. Run `pip install twine`.")
+        sys.exit(1)
+    build = subprocess.call(BUILD_CMD, shell=True)
+    check_dist = subprocess.call(CHECK_DIST_CMD, shell=True)
     status = subprocess.call(TEST_PUBLISH_CMD, shell=True)
     sys.exit(status)
+    
+if 'register' in sys.argv:
+    try:
+        __import__('twine')
+    except ImportError:
+        print("twine required. Run `pip install twine`.")
+        sys.exit(1)
+    status = subprocess.call(REGISTER_CMD, shell=True)
+    sys.exit(status)
 
 if 'run_tests' in sys.argv:
     try:
@@ -87,7 +106,7 @@ def read(fname):
     name='textblob-de',
     version=__version__,
     description='German language support for TextBlob.',
-    long_description=(
+    long_description=('\n' +
         read("README.rst") + '\n\n' + read("HISTORY.rst")),
     author='Markus Killer',
     author_email='m.killer@langui.ch',
@@ -105,7 +124,7 @@ def read(fname):
             "ext/_pattern/text/de/*.*",
         ]},
     install_requires=requires,
-    license='\n\n' + read("LICENSE") + '\n\n',
+    license='MIT',
     zip_safe=False,
     keywords=[
         'textblob',