From 63eb4de06b3960898c76020c5a78c3df20f5267d Mon Sep 17 00:00:00 2001 From: hugovk Date: Mon, 7 Sep 2015 15:07:35 +0300 Subject: [PATCH 1/3] Release 1.4.2 --- pylast/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pylast/__init__.py b/pylast/__init__.py index f621266..4382337 100644 --- a/pylast/__init__.py +++ b/pylast/__init__.py @@ -32,7 +32,7 @@ import warnings import re import six -__version__ = '1.4.1' +__version__ = '1.4.2' __author__ = 'Amr Hassan, hugovk' __copyright__ = "Copyright (C) 2008-2010 Amr Hassan, 2013-2015 hugovk" __license__ = "apache2" diff --git a/setup.py b/setup.py index 5a29c34..3fb0404 100755 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages setup( name="pylast", - version="1.4.1", + version="1.4.2", author="Amr Hassan ", install_requires=['six'], tests_require=['mock', 'pytest', 'coverage', 'pep8', 'pyyaml', 'pyflakes'], From 6382853b45a006c07f7d9823fa18fdbf6fe71411 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Mon, 7 Sep 2015 15:41:30 +0300 Subject: [PATCH 2/3] Check installation sooner [CI skip] --- RELEASING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASING.md b/RELEASING.md index e4ed249..b395aaa 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -17,6 +17,7 @@ git tag -a 1.5.0 -m "Release 1.5.0" python setup.py register python setup.py sdist --format=gztar upload ``` +* [ ] Check installation: `pip install -U pylast` * [ ] Push: `git push` * [ ] Push tags: `git push --tags` * [ ] Create new GitHub release: https://github.com/pylast/pylast/releases/new @@ -28,4 +29,4 @@ git checkout develop git merge master --ff-only git push ``` - * [ ] Check installation: `pip install -U pylast` + From 42e881824bb603d022a503f25a6cc170e8ed1ee0 Mon Sep 17 00:00:00 2001 From: hugovk Date: Thu, 10 Dec 2015 09:06:25 +0200 Subject: [PATCH 3/3] Add YAML rules [CI skip] --- .editorconfig | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index de5533f..b71c07e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,4 @@ -# top-most EditorConfig file +# Top-most EditorConfig file root = true # Unix-style newlines with a newline ending every file @@ -7,7 +7,13 @@ end_of_line = lf insert_final_newline = true charset = utf-8 -# 4 space indentation +# Four-space indentation [*.py] indent_size = 4 indent_style = space + +trim_trailing_whitespace = true + +# Two-space indentation +[*.yml] +indent_size = 2