Skip to content

Commit

Permalink
Merge pull request #22 from uweschmitt/fix_install
Browse files Browse the repository at this point in the history
fix installation when six is not installed yet
  • Loading branch information
adrn committed May 2, 2019
2 parents d2538b7 + 4a995b8 commit e00242b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
3 changes: 2 additions & 1 deletion schwimmbad/__init__.py
Expand Up @@ -12,8 +12,9 @@
- SerialPool: A serial pool, which uses the built-in ``map`` function
"""
import pkg_resources

__version__ = "0.4.dev"
__version__ = pkg_resources.require(__package__)[0].version
__author__ = "Adrian Price-Whelan <adrianmpw@gmail.com>"

# Standard library
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Expand Up @@ -4,10 +4,10 @@
# python setup.py sdist upload

# Standard library
import sys
import locale
import os
import subprocess
import sys
import warnings

try:
Expand All @@ -31,8 +31,7 @@ def rd(filename):
return r

# Remove the .dev for release
import schwimmbad
VERSION = schwimmbad.__version__
VERSION = "0.4.dev"

# Indicates if this version is a release version
RELEASE = 'dev' not in VERSION
Expand Down

0 comments on commit e00242b

Please sign in to comment.