From 4c0a28237fcf3196c7e293e5a610ea88e456f318 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 18 Mar 2013 15:13:31 -0700 Subject: [PATCH 1/5] Bumped version up a notch. --- compressor/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compressor/__init__.py b/compressor/__init__.py index 8797d61..6524f6c 100644 --- a/compressor/__init__.py +++ b/compressor/__init__.py @@ -1,2 +1,2 @@ # following PEP 386 -__version__ = "1.2" +__version__ = "1.3" From 6bd4f23415e12f01df98fb3cc07c580fdf4bcea3 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 18 Mar 2013 15:35:16 -0700 Subject: [PATCH 2/5] Updated links to the docs. --- README.rst | 4 ++-- docs/changelog.txt | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index d8b5399..9979f4e 100644 --- a/README.rst +++ b/README.rst @@ -48,7 +48,7 @@ tool it will be fairly easy to implement a custom filter. Simply extend from one of the available base classes. More documentation about the usage and settings of Django Compressor can be -found on `django_compressor.readthedocs.org`_. +found on `django-compressor.readthedocs.org`_. The source code for Django Compressor can be found and contributed to on `github.com/jezdez/django_compressor`_. There you can also file tickets. @@ -65,7 +65,7 @@ The `in-development version`_ of Django Compressor can be installed with .. _JSMin: http://www.crockford.com/javascript/jsmin.html .. _cssmin: https://github.com/zacharyvoase/cssmin .. _data URIs: http://en.wikipedia.org/wiki/Data_URI_scheme -.. _django_compressor.readthedocs.org: http://django_compressor.readthedocs.org/ +.. _django-compressor.readthedocs.org: http://django-compressor.readthedocs.org/en/latest/ .. _github.com/jezdez/django_compressor: https://github.com/jezdez/django_compressor .. _in-development version: http://github.com/jezdez/django_compressor/tarball/develop#egg=django_compressor-dev diff --git a/docs/changelog.txt b/docs/changelog.txt index 3a49590..20c1373 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -346,7 +346,7 @@ Major improvements and a lot of bugfixes, some of which are: - Added ``mtime_cache`` management command to add and/or remove all mtimes from the cache. -- Moved docs to Read The Docs: http://django_compressor.readthedocs.org +- Moved docs to Read The Docs: http://django-compressor.readthedocs.org/en/latest/ - Added optional ``compressor.storage.GzipCompressorFileStorage`` storage backend that gzips of the saved files automatically for easier deployment. diff --git a/setup.py b/setup.py index af7f2c6..c27b8a0 100644 --- a/setup.py +++ b/setup.py @@ -109,7 +109,7 @@ def find_package_data(where='.', package='', setup( name="django_compressor", version=find_version("compressor", "__init__.py"), - url='http://django_compressor.readthedocs.org/', + url='http://django-compressor.readthedocs.org/en/latest/', license='MIT', description="Compresses linked and inline JavaScript or CSS into single cached files.", long_description=read('README.rst'), From e4e64ea9da60366f3572ae9d502d3e01af08d0b5 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 18 Mar 2013 15:48:59 -0700 Subject: [PATCH 3/5] Updated authors file. --- AUTHORS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/AUTHORS b/AUTHORS index a13e678..245eafd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,18 +13,23 @@ Aaron Godfrey Adam "Cezar" Jenkins Adrian Holovaty Alen Mujezinovic +Alex Kessinger Andreas Pelme +Antti Hirvonen Apostolos Bessas +Ashley Camba Garrido Atamert Ölçgen Aymeric Augustin Bartek Ciszkowski Ben Firshman Ben Spaulding +Benjamin Gilbert Benjamin Wohlwend Bojan Mihelac Boris Shemigon Brad Whittington Bruno Renié +Cassus Adam Banko Chris Adams Chris Streeter Clay McClure @@ -34,7 +39,9 @@ Eugene Mirotin Fenn Bailey Francisco Souza Gert Van Gool +Greg McGuire Harro van der Klauw +Isaac Bythewood Iván Raskovsky Jaap Roes James Roe @@ -45,6 +52,7 @@ Jervis Whitley John-Scott Atlakson Jonas von Poser Jonathan Lukens +Julian Scheid Julien Phalip Justin Lilly Luis Nell @@ -53,7 +61,9 @@ Lukasz Balcerzak Maciek Szczesniak Maor Ben-Dayan Mark Lavin +Marsel Mavletkulov Matt Schick +Matthew Tretter Mehmet S. Catalbas Michael van de Waeter Mike Yumatov @@ -65,14 +75,18 @@ Peter Bengtsson Peter Lundberg Philipp Bosch Philipp Wollermann +Rich Leland Sam Dornan +Saul Shanabrook Selwin Ong Shabda Raaj Stefano Brentegani Sébastien Piquemal Thom Linton +Thomas Schreiber Tino de Bruijn Ulrich Petri +Ulysses V Vladislav Poluhin wesleyb Wilson Júnior \ No newline at end of file From 4cde49504c9013fc1e24e72fb1aafa974c913af7 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 18 Mar 2013 15:52:17 -0700 Subject: [PATCH 4/5] Add docs to package. --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index 2b07859..c7d4c74 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,7 @@ include AUTHORS include README.rst include LICENSE +recursive-include docs * recursive-include compressor/templates/compressor *.html recursive-include compressor/tests/media *.js *.css *.png *.coffee recursive-include compressor/tests/test_templates *.html From e299f91b65622d911d79bfbf83b3b474042651e2 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 18 Mar 2013 15:55:31 -0700 Subject: [PATCH 5/5] Updated year. --- LICENSE | 2 +- docs/conf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index e743ca8..e407633 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ django_compressor ----------------- -Copyright (c) 2009-2012 Django Compressor authors (see AUTHORS file) +Copyright (c) 2009-2013 Django Compressor authors (see AUTHORS file) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/docs/conf.py b/docs/conf.py index ffa6243..a0b1ab7 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -42,7 +42,7 @@ master_doc = 'index' # General information about the project. project = u'Django Compressor' -copyright = u'2012, Django Compressor authors' +copyright = u'2013, Django Compressor authors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the