Skip to content

Commit

Permalink
Merge pull request #336 from pepkit/fix_2to3
Browse files Browse the repository at this point in the history
Release 1.3.2
  • Loading branch information
nsheff authored Feb 9, 2022
2 parents cd1c7d4 + 18c90b6 commit df535be
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
6 changes: 6 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

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.

## [1.3.2] -- 2022-02-09

### Changed
- Fixed bug with use_2to3 for setuptools compatibility.


## [1.3.1] -- 2021-06-18

### Changed
Expand Down
2 changes: 1 addition & 1 deletion looper/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.3.1"
__version__ = "1.3.2"
14 changes: 2 additions & 12 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@
DEPENDENCIES.append("numexpr>=2.6.2")
extra["install_requires"] = DEPENDENCIES


# 2to3
if sys.version_info >= (3, ):
extra["use_2to3"] = True


# Additional files to include with package
def get_static(name, condition=None):
static = [os.path.join(name, f) for f in os.listdir(
Expand All @@ -55,12 +49,8 @@ def get_static(name, condition=None):
with open("looper/_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')
except(IOError, ImportError, OSError):
long_description = open('README.md').read()
with open("README.md") as f:
long_description = f.read()

setup(
name="looper",
Expand Down

0 comments on commit df535be

Please sign in to comment.