Merge branch 'master' into 2.0

This commit is contained in:
Julien Duponchelle committed 2017-03-13 15:42:58 +01:00
commit 5e2b619305
2 files changed
+9 -1

No files matched your search

+8
View File
@@ -10,3 +10,11 @@ install:
- pip install -rdev-requirements.txt
script:
- py.test -v -s tests
deploy:
provider: pypi
user: noplay
password:
secure: Fa66zp8ML4oSGwzkUMZi07MIYfO3tbS5gHFUaLN2mk2MBknhCjDYexmFJqT//sC/+xqv6sSJE6rz1EPoy/THbxj8R96ZgIyiUZIbDCbzgdy92d7J/eusrDoNdpApBLke8NqQqtFETb3addMZZNofQ3IDANFD2m2jY+KECU8z8NI=
on:
tags: true
repo: GNS3/gns3-server
+1 -1
View File
@@ -23,7 +23,7 @@
# or negative for a release candidate or beta (after the base version
# number has been incremented)
__version__ = "2.0.0rc2"
__version__ = "2.0.0dev11"
# If it's a git checkout try to add the commit
if "dev" in __version__: