Merge branch 'master' into develop
This commit is contained in:
commit
d1958ab8fd
|
@ -6,11 +6,11 @@
|
|||
git checkout master
|
||||
edit pylast/__init__.py setup.py
|
||||
git add pylast/__init__.py setup.py
|
||||
git commit -m "Release 1.3.0"
|
||||
git commit -m "Release 1.5.0"
|
||||
```
|
||||
* [ ] Tag the last commit with the version number:
|
||||
```bash
|
||||
git tag -a 1.3.0 -m "Release 1.3.0"
|
||||
git tag -a 1.5.0 -m "Release 1.5.0"
|
||||
```
|
||||
* [ ] Release on PyPI:
|
||||
```bash
|
||||
|
@ -20,9 +20,12 @@ python setup.py sdist --format=gztar upload
|
|||
* [ ] Push: `git push`
|
||||
* [ ] Push tags: `git push --tags`
|
||||
* [ ] Create new GitHub release: https://github.com/pylast/pylast/releases/new
|
||||
* Tag: Pick existing tag "1.5.0"
|
||||
* Title: "Release 1.5.0"
|
||||
* [ ] Update develop branch from master:
|
||||
```bash
|
||||
git checkout develop
|
||||
git merge master --ff-only
|
||||
git push
|
||||
```
|
||||
* [ ] Check installation: `pip install -U pylast`
|
||||
|
|
|
@ -32,7 +32,7 @@ import warnings
|
|||
import re
|
||||
import six
|
||||
|
||||
__version__ = '1.3.0'
|
||||
__version__ = '1.4.0'
|
||||
__author__ = 'Amr Hassan, hugovk'
|
||||
__copyright__ = "Copyright (C) 2008-2010 Amr Hassan, 2013-2015 hugovk"
|
||||
__license__ = "apache2"
|
||||
|
|
Loading…
Reference in a new issue