Skip to content

Commit

Permalink
Fixing conflict in setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
@karllark
karllark committed Dec 29, 2017
1 parent ad100ce commit 78c93b5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
# to get from other parts of the setup infrastructure
builtins._ASTROPY_PACKAGE_NAME_ = PACKAGENAME

# VERSION should be PEP440 compatible (http://www.python.org/dev/peps/pep-0440)
VERSION = metadata.get('version', '0.1.dev')
# VERSION should be PEP386 compatible (http://www.python.org/dev/peps/pep-0386)
VERSION = '1.1.dev'

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

0 comments on commit 78c93b5

Please sign in to comment.