From ba92f71fecd244ea7ac140159b77e83a2ea41217 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Fri, 11 Mar 2016 20:38:25 +0100 Subject: [PATCH] Prepare for 0.13 release --- .bumpversion.cfg | 2 +- CHANGES.rst | 12 ++++++++++++ MANIFEST.in | 1 + README.rst | 2 +- django_filters/__init__.py | 2 +- docs/conf.py | 4 ++-- requirements/docs.txt | 1 - requirements/maintainer.txt | 34 ++++++++++++++++++++++++++++++---- setup.py | 6 ++++-- 9 files changed, 52 insertions(+), 12 deletions(-) delete mode 100644 requirements/docs.txt diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 19df5fa..65c6c1b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.12.0 +current_version = 0.13.0 commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+))? diff --git a/CHANGES.rst b/CHANGES.rst index 2e73a8a..ed3eb04 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,15 @@ +Version 0.13.0 (2016-03-11) +--------------------------- + +* Add support for filtering by CSV #363 + +* Add DateTimeFromToRangeFilter #376 + +* Add Chinese translation #359 + +* Lots of fixes. + + Version 0.12.0 (2016-01-07) --------------------------- diff --git a/MANIFEST.in b/MANIFEST.in index bdd47ea..13d96d3 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,3 +8,4 @@ recursive-include docs * recursive-include requirements * recursive-include tests * recursive-include django_filters/locale * +prune docs/_build \ No newline at end of file diff --git a/README.rst b/README.rst index 5604138..19ec278 100644 --- a/README.rst +++ b/README.rst @@ -24,7 +24,7 @@ Install using pip:: Or clone the repo and add to your PYTHONPATH:: - git clone git@github.com:alex/django-filter.git + git clone git@github.com:carltongibson/django-filter.git Usage ----- diff --git a/django_filters/__init__.py b/django_filters/__init__.py index 035806e..eeb0868 100644 --- a/django_filters/__init__.py +++ b/django_filters/__init__.py @@ -3,7 +3,7 @@ from __future__ import absolute_import from .filterset import FilterSet from .filters import * -__version__ = '0.12.0' +__version__ = '0.13.0' def parse_version(version): diff --git a/docs/conf.py b/docs/conf.py index d47acc5..e6d2650 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -48,9 +48,9 @@ copyright = u'2013, Alex Gaynor and others.' # built documents. # # The short X.Y version. -version = '0.12.0' +version = '0.13.0' # The full version, including alpha/beta/rc tags. -release = '0.12.0' +release = '0.13.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/requirements/docs.txt b/requirements/docs.txt deleted file mode 100644 index 2806c16..0000000 --- a/requirements/docs.txt +++ /dev/null @@ -1 +0,0 @@ -Sphinx diff --git a/requirements/maintainer.txt b/requirements/maintainer.txt index 10d4e8c..b9bbbbf 100644 --- a/requirements/maintainer.txt +++ b/requirements/maintainer.txt @@ -1,4 +1,30 @@ -bumpversion -twine==1.5.0 -wheel==0.24.0 -coverage==3.7.1 \ No newline at end of file +alabaster==0.7.7 +argh==0.26.1 +Babel==2.2.0 +backports.ssl-match-hostname==3.4.0.2 +bumpversion==0.5.3 +certifi==2015.9.6.2 +coverage==3.7.1 +django-discover-runner==1.0 +docutils==0.12 +funcsigs==0.4 +Jinja2==2.8 +livereload==2.4.0 +MarkupSafe==0.23 +mock==1.3.0 +pathtools==0.1.2 +pbr==1.7.0 +pkginfo==1.2.1 +Pygments==2.1.3 +pytz==2015.7 +PyYAML==3.11 +requests==2.9.1 +requests-toolbelt==0.6.0 +six==1.9.0 +snowballstemmer==1.2.1 +Sphinx==1.3.6 +sphinx-autobuild==0.5.2 +sphinx-rtd-theme==0.1.9 +tornado==4.2.1 +twine==1.6.5 +watchdog==0.8.3 diff --git a/setup.py b/setup.py index a4054d1..123ada3 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ f = open('README.rst') readme = f.read() f.close() -version = '0.12.0' +version = '0.13.0' if sys.argv[-1] == 'publish': if os.system("pip freeze | grep wheel"): @@ -30,7 +30,9 @@ setup( long_description=readme, author='Alex Gaynor', author_email='alex.gaynor@gmail.com', - url='http://github.com/alex/django-filter/tree/master', + maintainer='Carlton Gibson', + maintainer_email='carlton.gibson@noumenal.es', + url='http://github.com/carltongibson/django-filter/tree/master', packages=find_packages(exclude=['tests']), package_data = { 'django_filters': [