Merge pull request #77 from pepkit/dev

0.13.2, remove use_2to3
pepkit · Nov 5, 2021 · ecaa6db · ecaa6db
2 parents b2c80a6 + bfe95cb
commit ecaa6db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git 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
@@ -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

diff --git 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,