From e3325d2f74fff4a1166cbd3944b750417666823a Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Fri, 1 Nov 2013 11:48:08 +0000 Subject: [PATCH 1/6] Preparing release 1.3.4 --- CHANGES.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 1a05271..f6712e5 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,7 @@ Changes ======= -1.3.4 (unreleased) +1.3.4 (2013-11-01) ------------------ - Update README.rst for PyPI [marty] [camilonova] [graingert] diff --git a/setup.py b/setup.py index 9eb3eaf..bf74613 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from setuptools import setup, find_packages setup( name='django-axes', - version='1.3.4.dev0', + version='1.3.4', description="Keep track of failed login attempts in Django-powered sites.", long_description=(open('README.rst', 'r').read() + '\n' + open('CHANGES.txt', 'r').read()), From b06498d8f3bec85f4975d6032f99be5dcb36b476 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Fri, 1 Nov 2013 11:48:47 +0000 Subject: [PATCH 2/6] Back to development: 1.3.5 --- CHANGES.txt | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index f6712e5..2d7fe81 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,12 @@ Changes ======= +1.3.5 (unreleased) +------------------ + +- Nothing changed yet. + + 1.3.4 (2013-11-01) ------------------ diff --git a/setup.py b/setup.py index bf74613..9dfedad 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from setuptools import setup, find_packages setup( name='django-axes', - version='1.3.4', + version='1.3.5.dev0', description="Keep track of failed login attempts in Django-powered sites.", long_description=(open('README.rst', 'r').read() + '\n' + open('CHANGES.txt', 'r').read()), From d524e3f3e9562964378abbb94a3da69e60959f52 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Fri, 1 Nov 2013 12:02:56 +0000 Subject: [PATCH 3/6] pull version from the correct package --- axes/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/axes/__init__.py b/axes/__init__.py index 618f94a..cb0809d 100644 --- a/axes/__init__.py +++ b/axes/__init__.py @@ -1,5 +1,7 @@ try: - __version__ = __import__('pkg_resources').get_distribution('clamd').version + __version__ = __import__('pkg_resources').get_distribution( + 'django-axes' + ).version except: __version__ = '' From 89548fd373959b8a57fe7f5878327e95195d2d98 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Fri, 1 Nov 2013 12:07:15 +0000 Subject: [PATCH 4/6] add history --- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 2d7fe81..834f0f4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,7 +4,7 @@ Changes 1.3.5 (unreleased) ------------------ -- Nothing changed yet. +- Fix an issue with __version__ loading the wrong version [graingert] 1.3.4 (2013-11-01) From 8ee1e138e43297de225ac4b366aac824777cb295 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Fri, 1 Nov 2013 12:07:30 +0000 Subject: [PATCH 5/6] Preparing release 1.3.5 --- CHANGES.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 834f0f4..a70211c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,7 @@ Changes ======= -1.3.5 (unreleased) +1.3.5 (2013-11-01) ------------------ - Fix an issue with __version__ loading the wrong version [graingert] diff --git a/setup.py b/setup.py index 9dfedad..8309fae 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from setuptools import setup, find_packages setup( name='django-axes', - version='1.3.5.dev0', + version='1.3.5', description="Keep track of failed login attempts in Django-powered sites.", long_description=(open('README.rst', 'r').read() + '\n' + open('CHANGES.txt', 'r').read()), From ecfee3459815e5abcb0240ba8435ce7de8b940d9 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Fri, 1 Nov 2013 12:07:50 +0000 Subject: [PATCH 6/6] Back to development: 1.3.6 --- CHANGES.txt | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index a70211c..32836f7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,12 @@ Changes ======= +1.3.6 (unreleased) +------------------ + +- Nothing changed yet. + + 1.3.5 (2013-11-01) ------------------ diff --git a/setup.py b/setup.py index 8309fae..475efcf 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from setuptools import setup, find_packages setup( name='django-axes', - version='1.3.5', + version='1.3.6.dev0', description="Keep track of failed login attempts in Django-powered sites.", long_description=(open('README.rst', 'r').read() + '\n' + open('CHANGES.txt', 'r').read()),