Hirad/pylast
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
hugovk 2015-09-05 10:19:20 +03:00
parent fc293da2ce 072f0aca1a
commit d1958ab8fd
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
RELEASING.md
View file

@ -6,11 +6,11 @@
git checkout master git checkout master
edit pylast/__init__.py setup.py edit pylast/__init__.py setup.py
git add 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: * [ ] Tag the last commit with the version number:
```bash ```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: * [ ] Release on PyPI:
```bash ```bash
@ -20,9 +20,12 @@ python setup.py sdist --format=gztar upload
* [ ] Push: `git push` * [ ] Push: `git push`
* [ ] Push tags: `git push --tags` * [ ] Push tags: `git push --tags`
* [ ] Create new GitHub release: https://github.com/pylast/pylast/releases/new * [ ] 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: * [ ] Update develop branch from master:
```bash ```bash
git checkout develop git checkout develop
git merge master --ff-only git merge master --ff-only
git push git push
``` ```
* [ ] Check installation: `pip install -U pylast`

2
pylast/__init__.py
View file

@ -32,7 +32,7 @@ import warnings
import re import re
import six import six
__version__ = '1.3.0' __version__ = '1.4.0'
__author__ = 'Amr Hassan, hugovk' __author__ = 'Amr Hassan, hugovk'
__copyright__ = "Copyright (C) 2008-2010 Amr Hassan, 2013-2015 hugovk" __copyright__ = "Copyright (C) 2008-2010 Amr Hassan, 2013-2015 hugovk"
__license__ = "apache2" __license__ = "apache2"

2
setup.py
View file

@ -4,7 +4,7 @@ from setuptools import setup, find_packages
setup( setup(
name="pylast", name="pylast",
version="1.3.0", version="1.4.0",
author="Amr Hassan <amr.hassan@gmail.com>", author="Amr Hassan <amr.hassan@gmail.com>",
install_requires=['six'], install_requires=['six'],
tests_require=['mock', 'pytest', 'coverage', 'pep8', 'pyyaml', 'pyflakes'], tests_require=['mock', 'pytest', 'coverage', 'pep8', 'pyyaml', 'pyflakes'],