From aa5fe3b4cb5db19783f494dd87ea049575b7c4e2 Mon Sep 17 00:00:00 2001 From: nsheff Date: Thu, 4 Nov 2021 20:43:08 -0400 Subject: [PATCH 1/3] fix setuptools 58 compatibility --- setup.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index 2d1ab2b..13186fa 100644 --- a/setup.py +++ b/setup.py @@ -25,21 +25,13 @@ def read_reqs(reqs_name): DEPENDENCIES = read_reqs("all") -# 2to3 -if sys.version_info >= (3,): - extra["use_2to3"] = True extra["install_requires"] = DEPENDENCIES with open("{}/_version.py".format(PACKAGE), "r") as versionfile: version = versionfile.readline().split()[-1].strip("\"'\n") -# Handle the pypi README formatting. -try: - import pypandoc - - long_description = pypandoc.convert_file("README.md", "rst") -except (IOError, ImportError, OSError): - long_description = open("README.md").read() +with open('README.md') as f: + long_description = f.read() setup( name=PACKAGE, From 72977b95b9296e23b1821c6d1295befad425d3dc Mon Sep 17 00:00:00 2001 From: nsheff Date: Thu, 4 Nov 2021 20:44:17 -0400 Subject: [PATCH 2/3] fix setuptools bug --- attmap/_version.py | 2 +- docs/changelog.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/attmap/_version.py b/attmap/_version.py index 7e0dc0e..83ce76f 100644 --- a/attmap/_version.py +++ b/attmap/_version.py @@ -1 +1 @@ -__version__ = "0.13.1" +__version__ = "0.13.2" diff --git a/docs/changelog.md b/docs/changelog.md index 1e964c0..fdad8e9 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,5 +1,9 @@ # Changelog +## [0.13.2] - 2021-11-04 +### Fixed +- Made compatibile with setuptools 58 by removing use_2to3 + ## [0.13.1] - 2021-11-04 ### Added - `_excl_classes_from_todict`, which can be used to list classes to be excluded from the `dict` representation From bfe95cb2cbd8e696086fd1136bc8f79e53953904 Mon Sep 17 00:00:00 2001 From: nsheff Date: Thu, 4 Nov 2021 20:51:28 -0400 Subject: [PATCH 3/3] lint --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 13186fa..094d620 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ def read_reqs(reqs_name): with open("{}/_version.py".format(PACKAGE), "r") as versionfile: version = versionfile.readline().split()[-1].strip("\"'\n") -with open('README.md') as f: +with open("README.md") as f: long_description = f.read() setup(