From 17fce974fe960bdcc49fdf1678cd58971d1fe568 Mon Sep 17 00:00:00 2001 From: nsheff Date: Thu, 4 Nov 2021 12:28:20 -0400 Subject: [PATCH 1/4] remove use_2to3, simplify markdown readme in setup --- setup.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/setup.py b/setup.py index 4d484ec..df3dfa3 100644 --- a/setup.py +++ b/setup.py @@ -15,22 +15,13 @@ # Additional keyword arguments for setup(). extra = {"install_requires": DEPENDENCIES} -if sys.version_info >= (3,): - extra["use_2to3"] = True with open("refgenconf/_version.py", "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") - 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=PACKAGE_NAME, @@ -60,5 +51,3 @@ author=u"Nathan Sheffield, Vince Reuter, Michal Stolarczyk", **extra ) - -print(msg) From de300841f7e48af5acba16c64eaec4827e6cf8bf Mon Sep 17 00:00:00 2001 From: nsheff Date: Thu, 4 Nov 2021 12:29:46 -0400 Subject: [PATCH 2/4] version, changelog --- docs/changelog.md | 5 +++++ refgenconf/_version.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/changelog.md b/docs/changelog.md index 7a9b4e1..c38168d 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,6 +2,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format. +## [0.12.2] - 2021-11-04 + +### Fixed +- Removed use_2to3 for setuptools 58 compatibility. + ## [0.12.1] - 2021-10-11 ### Fixed diff --git a/refgenconf/_version.py b/refgenconf/_version.py index def467e..76da4a9 100644 --- a/refgenconf/_version.py +++ b/refgenconf/_version.py @@ -1 +1 @@ -__version__ = "0.12.1" +__version__ = "0.12.2" From eaa9183659078129741ad259669b39bcc367d7c6 Mon Sep 17 00:00:00 2001 From: nsheff Date: Thu, 4 Nov 2021 12:30:41 -0400 Subject: [PATCH 3/4] require updated yacman --- requirements/requirements-all.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements-all.txt b/requirements/requirements-all.txt index 3824ac0..8c23758 100644 --- a/requirements/requirements-all.txt +++ b/requirements/requirements-all.txt @@ -4,5 +4,5 @@ pyfaidx pyyaml requests rich>=9.0.1 -yacman>=0.8.2 +yacman>=0.8.3 tqdm From 4c1331dfd5c1704dc7a29e2b7e5bacc15af17616 Mon Sep 17 00:00:00 2001 From: nsheff Date: Thu, 4 Nov 2021 12:31:04 -0400 Subject: [PATCH 4/4] lint --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index df3dfa3..e44359e 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ version = versionfile.readline().split()[-1].strip("\"'\n") # Handle the pypi README formatting. -with open('README.md') as f: +with open("README.md") as f: long_description = f.read() setup(