From bcc36a565ddf8aa114489a5079970d64c6fcc0cb Mon Sep 17 00:00:00 2001 From: step21 Date: Tue, 13 Oct 2020 11:02:18 +0200 Subject: [PATCH 1/3] Remove setuptools-markdown requirement ... as this is now built-in --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 790ae9cfb4..4ea396a7b7 100644 --- a/setup.py +++ b/setup.py @@ -85,7 +85,6 @@ "typing-extensions>=3.7.4.1,<4;python_version<'3.8'", "websockets>=8.1.0,<9.0.0", ], - setup_requires=['setuptools-markdown'], python_requires='>=3.6,<4', extras_require=extras_require, py_modules=['web3', 'ens', 'ethpm'], From 5ec654a7d386cc8c36e516330430eaae27c5c412 Mon Sep 17 00:00:00 2001 From: step21 Date: Wed, 14 Oct 2020 12:51:06 +0200 Subject: [PATCH 2/3] updated markdown metadata and bumped setuptools to 38.6.0 --- setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 4ea396a7b7..bb15929e72 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ "pytest-pythonpath>=0.3", "pytest-watch>=4.2,<5", "pytest-xdist>=1.29,<2", - "setuptools>=36.2.0", + "setuptools>=38.6.0", "tox>=1.8.0", "tqdm>4.32,<5", "twine>=1.13,<2", @@ -57,13 +57,16 @@ + extras_require['dev'] ) +with open('./README.md') as readme: + long_description = readme.read() + setup( name='web3', # *IMPORTANT*: Don't manually change the version here. Use the 'bumpversion' utility. version='5.12.2', description="""Web3.py""", long_description_content_type='text/markdown', - long_description_markdown_filename='README.md', + long_description=long_description, author='Piper Merriam', author_email='pipermerriam@gmail.com', url='https://github.com/ethereum/web3.py', From d2d7f4df68a14fd4e364e226487f490da554fcf6 Mon Sep 17 00:00:00 2001 From: step21 Date: Wed, 14 Oct 2020 12:59:52 +0200 Subject: [PATCH 3/3] added 1773 newsfragment --- newsfragments/1773.misc.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/1773.misc.rst diff --git a/newsfragments/1773.misc.rst b/newsfragments/1773.misc.rst new file mode 100644 index 0000000000..64c9e55bb1 --- /dev/null +++ b/newsfragments/1773.misc.rst @@ -0,0 +1 @@ +Remove setuptools-markdown dependency and bump setuptools to v38.6.0 \ No newline at end of file