From 92b93f7a6583d982d97268e1986b6c7ee9f3e5e0 Mon Sep 17 00:00:00 2001 From: Vikram Saraph <93892166+vhxs@users.noreply.github.com> Date: Sun, 18 Sep 2022 22:32:54 -0400 Subject: [PATCH 1/6] Update README.rst --- README.rst | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index a53bf42..9a3a467 100644 --- a/README.rst +++ b/README.rst @@ -1,3 +1,16 @@ +everything below this is from the original repo's README +my really rough notes below: + +- this package hasn't been maintained lately +- `setup.py` seems to use `distutils` to install +- `distutils` is deprecated +- installation fails with poetry 1.2 +- it is generally recommended to migrate from distutils to setuptools. if i do that, and publish to pypi, would that fix it? +- https://setuptools.pypa.io/en/latest/deprecated/distutils-legacy.html + +=========== + + .. image:: https://travis-ci.org/peter17/mediawiki-parser.svg?branch=master :alt: Build Status :target: https://travis-ci.org/peter17/mediawiki-parser @@ -159,4 +172,4 @@ Please don't hesitate to report bugs that you may find when using this tool. Special thanks ============== - * To Nicholas Burlett for his directory restructure, performance improvements and other fixes \ No newline at end of file + * To Nicholas Burlett for his directory restructure, performance improvements and other fixes From 704532462a31413dfc4c2b2b179177fe64c6a3a4 Mon Sep 17 00:00:00 2001 From: vsaraph Date: Mon, 19 Sep 2022 18:12:04 -0400 Subject: [PATCH 2/6] replace distutils with setuptools, maybe? --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 10b75d8..b79118b 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,8 @@ #!/bin/env python import os -from setuptools import setup -from distutils.cmd import Command -from distutils.command.build import build as _build +from setuptools import setup, Command +from setuptools.command.build import build as _build # Utility function to read the README file. # Used for the long_description. It's nice, because now 1) we have a top level From 9330bf3a79addb393f1a4bfb0583050e2adb2c09 Mon Sep 17 00:00:00 2001 From: vsaraph Date: Mon, 19 Sep 2022 18:32:11 -0400 Subject: [PATCH 3/6] pijnu is also a setup dependency --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index b79118b..f26b5c0 100644 --- a/setup.py +++ b/setup.py @@ -66,6 +66,7 @@ class build(_build): scripts=[], data_files=[], install_requires=['pijnu>=20160727'], + setup_requires=['pijnu>=20160727'], cmdclass={'build_parsers': build_parsers, 'build': build}, classifiers=[ 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', From 87ad7cf571f78534d5a9d158f0c636496e622ff8 Mon Sep 17 00:00:00 2001 From: vsaraph Date: Mon, 19 Sep 2022 19:02:15 -0400 Subject: [PATCH 4/6] update setup.py to point to different pypi package --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index f26b5c0..817cd23 100644 --- a/setup.py +++ b/setup.py @@ -53,10 +53,10 @@ class build(_build): if __name__ == '__main__': setup( - name="mediawiki-parser", - author="Erik Rose, Peter Potrowl", - author_email="grinch@grinchcentral.com, peter.potrowl@gmail.com", - url="https://github.com/peter17/mediawiki-parser", + name="mediawiki-parser-fix", + author="Erik Rose, Peter Potrowl, Vikram Saraph", + author_email="grinch@grinchcentral.com, peter.potrowl@gmail.com, vikram.saraph.22@gmail.com", + url="https://github.com/vhxs/mediawiki-parser", version="0.4.1", license="GPL v3", description="A parser for the MediaWiki syntax, based on Pijnu.", From 88b43f5a21cd9b2e2e4ebca7b29d3dfbc99dbc0b Mon Sep 17 00:00:00 2001 From: Vikram Saraph <93892166+vhxs@users.noreply.github.com> Date: Mon, 19 Sep 2022 19:02:53 -0400 Subject: [PATCH 5/6] Update README.rst --- README.rst | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/README.rst b/README.rst index 9a3a467..81fd607 100644 --- a/README.rst +++ b/README.rst @@ -1,16 +1,3 @@ -everything below this is from the original repo's README -my really rough notes below: - -- this package hasn't been maintained lately -- `setup.py` seems to use `distutils` to install -- `distutils` is deprecated -- installation fails with poetry 1.2 -- it is generally recommended to migrate from distutils to setuptools. if i do that, and publish to pypi, would that fix it? -- https://setuptools.pypa.io/en/latest/deprecated/distutils-legacy.html - -=========== - - .. image:: https://travis-ci.org/peter17/mediawiki-parser.svg?branch=master :alt: Build Status :target: https://travis-ci.org/peter17/mediawiki-parser From 0c2f5c95cf53e0749f2476be816f8fba3f1184de Mon Sep 17 00:00:00 2001 From: anon Date: Mon, 19 Sep 2022 21:49:59 -0400 Subject: [PATCH 6/6] revert to original package name/authors --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 817cd23..f26b5c0 100644 --- a/setup.py +++ b/setup.py @@ -53,10 +53,10 @@ class build(_build): if __name__ == '__main__': setup( - name="mediawiki-parser-fix", - author="Erik Rose, Peter Potrowl, Vikram Saraph", - author_email="grinch@grinchcentral.com, peter.potrowl@gmail.com, vikram.saraph.22@gmail.com", - url="https://github.com/vhxs/mediawiki-parser", + name="mediawiki-parser", + author="Erik Rose, Peter Potrowl", + author_email="grinch@grinchcentral.com, peter.potrowl@gmail.com", + url="https://github.com/peter17/mediawiki-parser", version="0.4.1", license="GPL v3", description="A parser for the MediaWiki syntax, based on Pijnu.",