Skip to content

Commit

Permalink
Merge pull request #136 from refgenie/fix-setuptools
Browse files Browse the repository at this point in the history
Fix setuptools, release 0.12.2
  • Loading branch information
nsheff authored Nov 4, 2021
2 parents 13a7258 + 4c1331d commit 6697b2e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 15 deletions.
5 changes: 5 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion refgenconf/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.12.1"
__version__ = "0.12.2"
2 changes: 1 addition & 1 deletion requirements/requirements-all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ pyfaidx
pyyaml
requests
rich>=9.0.1
yacman>=0.8.2
yacman>=0.8.3
tqdm
15 changes: 2 additions & 13 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -60,5 +51,3 @@
author=u"Nathan Sheffield, Vince Reuter, Michal Stolarczyk",
**extra
)

print(msg)

0 comments on commit 6697b2e

Please sign in to comment.