From e5f9ff9c550e8ea606a2920fe27661d0e552565d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Sun, 15 Oct 2023 14:03:51 -0400 Subject: [PATCH 1/3] BUG: Use a single author-email in `setup.py` Use a single author-email in `setup.py`. Fixes: ``` WARNING Error during upload. Retry with the --verbose option for more details. ERROR HTTPError: 400 Bad Request from https://test.pypi.org/legacy/ 'fzhang@bwh.harvard.edu; odonnell@bwh.harvard.edu' is an invalid value for Author-email. Error: Use a valid email address See https://packaging.python.org/specifications/core-metadata for more information. ``` raised when trying to upload the package to TestPyPI using `$ twine upload --repository testpypi dist/*` --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b921d76b..49742d2b 100755 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ name='whitematteranalysis', version='0.3.0', author='Fan Zhang and Lauren O\'Donnell', - author_email='fzhang@bwh.harvard.edu; odonnell@bwh.harvard.edu', + author_email='odonnell@bwh.harvard.edu', packages=['whitematteranalysis'], license='LICENSE.txt', description='Processing of whole-brain streamline tractography.', From 2a05030e4c60437faae44ff166961eacd48c578c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Sun, 15 Oct 2023 14:18:38 -0400 Subject: [PATCH 2/3] BUG: Set the long description content type to Markdown Set the long description content type to Markdown in `setup.py` as the contents are read from the `README.md` file. Fixes: ``` WARNING Error during upload. Retry with the --verbose option for more details. ERROR HTTPError: 400 Bad Request from https://test.pypi.org/legacy/ The description failed to render in the default format of reStructuredText. See https://test.pypi.org/help/#description-content-type for more information. ``` raised when trying to upload the package to TestPyPI using `$ twine upload --repository testpypi dist/*` --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 49742d2b..881b74bd 100755 --- a/setup.py +++ b/setup.py @@ -40,6 +40,7 @@ license='LICENSE.txt', description='Processing of whole-brain streamline tractography.', long_description=open('README.md').read(), + long_description_content_type="text/markdown", setup_requires=setup_requires, install_requires=setup_requires + external_dependencies, extras_require={'doc': ['sphinx', 'sphinx-argparse', 'sphinx_rtd_theme']}, From 2532cd5a8b6b6998f95041ac25be920563965209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Sun, 15 Oct 2023 14:22:02 -0400 Subject: [PATCH 3/3] BUG: Remove non-existing pattern under `doc` in `MANIFEST.in` Remove non-existing `*.txt` pattern under directory `docs` in `MANIFEST.in`. Fixes ``` reading manifest template 'MANIFEST.in' warning: no files found matching '*.txt' under directory 'docs' ``` raised when trying to upload the package to TestPyPI using `$ twine upload --repository testpypi dist/* Take advantage of the commit to fix the documentation folder pattern name to the actual name used in the package. --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 2985d188..356ff4f0 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ include *.txt -recursive-include docs *.txt +recursive-include doc