Skip to content

Commit 980cc53

Browse files
author
Matthew Fisher
committed
Merge pull request #1806 from bacongobbler/dev-version
feat(version): use -dev flag for unversioned releases
2 parents 5e66379 + 940752b commit 980cc53

5 files changed

Lines changed: 10 additions & 4 deletions

File tree

client/deis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
from termcolor import colored
7171
import yaml
7272

73-
__version__ = '0.12.0'
73+
__version__ = '0.12.0-dev'
7474

7575

7676
locale.setlocale(locale.LC_ALL, '')

client/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929

3030
setup(name='deis',
31-
version='0.12.0',
31+
version='0.12.0-dev',
3232
license=APACHE_LICENSE,
3333
description='Command-line Client for Deis, the open PaaS',
3434
author='OpDemand',

controller/deis/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
from .celery import app # noqa
1010

1111

12-
__version__ = '0.12.0'
12+
__version__ = '0.12.0-dev'

docs/contributing/releases.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ github.com/deis/deis Repo
3535
* The UI for this is well-hidden: go to https://index.docker.io/builds/ and
3636
click "Edit".
3737
- Commit and push the deis/deis release and tag
38+
* remove "-dev" from __version__ fields in Python packages
39+
* remove "-dev" from Version constant in version/version.go
3840
* ``git commit -a -m 'Updated for vX.Y.Z release.'``
3941
* ``git push origin release``
4042
* ``git tag vX.Y.Z``
@@ -51,7 +53,8 @@ github.com/deis/deis Repo
5153
publically downloadable
5254
- Switch master to upcoming release
5355
* ``git checkout master``
54-
* update __version__ fields in Python packages to *next* version
56+
* update __version__ fields in Python packages to *next* version + "-dev"
57+
* update Version constant in version/version.go to *next* version + "-dev"
5558
* ``git commit -a -m 'Switch master to vA.B.C.'`` (**next** version)
5659
* ``git push origin master``
5760

version/version.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package version
2+
3+
const Version = "0.12.0-dev"

0 commit comments

Comments
 (0)