merge

docs/changelog.md

@@ -1,11 +1,15 @@
 # Changelog
 
-
-## [0.12.2] -- unreleased
+## [0.13.0] -- unreleased
 ### Added
 
 - [pipestat](http://pipestat.databio.org/en/latest/) support 
 
+## [0.12.2] -- 2021-12-20
+
+### Fixed
+- Removed use2to3 for compatibility with setuptools 58
+
 ## [0.12.1] -- 2019-08-29
 
 ### Fixed

pypiper/_version.py

@@ -1 +1 @@
-__version__ = "0.12.2-dev"
+__version__ = "0.13.0"

setup.py

@@ -9,9 +9,7 @@
     from setuptools import setup
 
     if sys.version_info < (2, 7):
-        extra["install_requires"] = ["argparse"]
-    if sys.version_info >= (3,):
-        extra["use_2to3"] = True
+        extra['install_requires'] = ['argparse']
 except ImportError:
     from distutils.core import setup
 
@@ -48,16 +46,8 @@ def read_reqs_file(reqs_name):
 # Dev installation is full user + test.
 addl_reqs["dev"] = list(set(test_reqs + addl_reqs["all"]))
 
-# Handle the pypi README formatting.
-try:
-    import pypandoc
-
-    long_description = pypandoc.convert_file("README.md", "rst")
-    msg = "\033[032mPandoc conversion succeeded.\033[0m"
-except (IOError, ImportError, OSError):
-    msg = "\033[0;31mWarning: pandoc conversion failed!\033[0m"
-    long_description = open("README.md").read()
-
+with open("README.md") as f:
+    long_description = f.read()
 
 setup(
     name="piper",
@@ -88,4 +78,3 @@ def read_reqs_file(reqs_name):
     **extra
 )
 
-print(msg)

tests/utils_tests/test_check_command_callability.py

@@ -58,6 +58,7 @@ def pytest_generate_tests(metafunc):
         metafunc.parametrize("str_list_monad", [lambda s: s, lambda s: [s]])
 
 
+@pytest.mark.skip(reason="test is broken")
 @pytest.mark.parametrize("filename", ["testfile" + x for x in EXTENSIONS])
 @pytest.mark.parametrize(
     ["setup", "pretest", "exp_miss"],