From f934c6aeb11a4bc5d7ab6c2c93dd0ca099153124 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Wed, 25 Mar 2015 11:51:32 +0100 Subject: [PATCH 1/5] Change Notes: Add >1.4 changes --- docs/changelog.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index 26a4a35..627e99f 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -1,6 +1,16 @@ Changelog ========= +v1.5 (03/27/2015) +----------------- + +- Added compatibility with Django 1.7.x and 1.8.x + +- Fixed various other issues. See full `Changes for 1.5`_ on GitHub + +.. _Changes for 1.5: https://github.com/django-compressor/django-compressor/compare/1.4...develop + + v1.4 (06/20/2014) ----------------- From 248544d052333e87cbf540f918be86b8d8369c6a Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Wed, 25 Mar 2015 14:33:51 +0100 Subject: [PATCH 2/5] Full list of merged PRs --- docs/changelog.txt | 72 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 3 deletions(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index 627e99f..da53d5a 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -4,11 +4,77 @@ Changelog v1.5 (03/27/2015) ----------------- -- Added compatibility with Django 1.7.x and 1.8.x +`Full Changelog `_ -- Fixed various other issues. See full `Changes for 1.5`_ on GitHub +- Fix typo and restyle manage command examples `\#604 `_ (`alimony `_) -.. _Changes for 1.5: https://github.com/django-compressor/django-compressor/compare/1.4...develop +- Fix compress command for 1.8 `\#601 `_ (`carltongibson `_) + +- Fix build `\#599 `_ (`carltongibson `_) + +- Update settings.txt `\#584 `_ (`johnfraney `_) + +- Fix Django 1.8 warnings `\#583 `_ (`sdfsdhgjkbmnmxc `_) + +- Handle TypeError from import\_module `\#571 `_ (`blueyed `_) + +- Fix reading UTF-8 files which have BOM `\#568 `_ (`JereMalinen `_) + +- shlex.quote/pipes.quote is not compatible with Windows `\#561 `_ (`thenewguy `_) + +- Run automated tests on Django 1.7 `\#556 `_ (`frewsxcv `_) + +- Patch 1 `\#555 `_ (`francescozaia `_) + +- Fix AttributeError in offline compression `\#554 `_ (`cbjadwani `_) + +- Support for clean-css `\#551 `_ (`vovanbo `_) + +- Types at readme \(-engine should be --engine\) `\#540 `_ (`lukaszb `_) + +- Fix typo `\#539 `_ (`alimony `_) + +- Fix link markup `\#530 `_ (`merwok `_) + +- Add support for COMPRESS\_CSS\_HASHING\_METHOD = None `\#526 `_ (`diox `_) + +- Remove compatibility with old 'staticfiles' app `\#525 `_ (`diox `_) + +- Use get\_template\(\) when dealing with django templates `\#524 `_ (`diox `_) + +- Fix FilterBase clears self.type for subclasses `\#479 `_ (`iknite `_) + +- Remove unnecessary filename and existence checks in CssAbsoluteFilter `\#471 `_ (`agriffis `_) + +- Fix minor typographical error in docs/index `\#594 `_ (`varunsharma `_) + +- Fix deprecation warning `\#548 `_ (`davidfischer-ch `_) + +- Add "enabled" override to compress template tag `\#547 `_ (`davidfischer-ch `_) + +- CSSO support `\#538 `_ (`vovanbo `_) + +- quote filename in command `\#536 `_ (`MikeAmy `_) + +- quote filename e.g. in case it contains spaces `\#535 `_ (`MikeAmy `_) + +- Put charset back into kwargs `\#523 `_ (`zmetcalf `_) + +- Fix bug with css compress for static files `\#504 `_ (`rogaha `_) + +- Support for async/defer tags `\#482 `_ (`hkpeprah `_) + +- resolve \[issue 171\] : offline compressor to compress 'compress tags' if those are not in child template but in parent template. `\#436 `_ (`sjiitr `_) + +- Don't leave `compressed` in the render context `\#354 `_ (`gavinwahl `_) + +- Adding support to ignore some file paths during offline compression `\#335 `_ (`ayadav `_) + +- Use django.template.loader.get\_template\(\) in compress management command `\#282 `_ (`mattpatey `_) + +- Compress selected templates `\#248 `_ (`jaap3 `_) + +- re-implementing default documented behaviour for uncompressable files, fixes \#241 `\#246 `_ (`ssaboum `_) v1.4 (06/20/2014) From b91ea517c66b2d136164f5e687bc18a2f98a0b91 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Fri, 27 Mar 2015 15:36:02 +0100 Subject: [PATCH 3/5] Tidy up as per @diox's comments --- docs/changelog.txt | 70 ++++++++++------------------------------------ 1 file changed, 14 insertions(+), 56 deletions(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index da53d5a..d127636 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -6,75 +6,33 @@ v1.5 (03/27/2015) `Full Changelog `_ -- Fix typo and restyle manage command examples `\#604 `_ (`alimony `_) +- Fix compress command and run automated tests for Django 1.8 (`carltongibson `_) -- Fix compress command for 1.8 `\#601 `_ (`carltongibson `_) +- Fix Django 1.8 warnings (`sdfsdhgjkbmnmxc `_) -- Fix build `\#599 `_ (`carltongibson `_) +- Handle TypeError from import_module (`blueyed `_) -- Update settings.txt `\#584 `_ (`johnfraney `_) +- Fix reading UTF-8 files which have BOM (`JereMalinen `_) -- Fix Django 1.8 warnings `\#583 `_ (`sdfsdhgjkbmnmxc `_) +- Fix incompatibility with Windows (shell_quote is not supported) (`thenewguy `_) -- Handle TypeError from import\_module `\#571 `_ (`blueyed `_) +- Run automated tests on Django 1.7 (`frewsxcv `_) -- Fix reading UTF-8 files which have BOM `\#568 `_ (`JereMalinen `_) +- Ignore non-existent {{ block.super }} in offline compression instead of raising AttributeError (`cbjadwani `_) -- shlex.quote/pipes.quote is not compatible with Windows `\#561 `_ (`thenewguy `_) +- Support for clean-css (`vovanbo `_) -- Run automated tests on Django 1.7 `\#556 `_ (`frewsxcv `_) +- Fix link markup (`@merwok `_) -- Patch 1 `\#555 `_ (`francescozaia `_) +- Add support for COMPRESS_CSS_HASHING_METHOD = None (`diox `_) -- Fix AttributeError in offline compression `\#554 `_ (`cbjadwani `_) +- Remove compatibility with old 'staticfiles' app (`diox `_) -- Support for clean-css `\#551 `_ (`vovanbo `_) +- In compress command, use get_template() instead of opening template files manually, fixing compatibility issues with custom template loaders (`diox `_) -- Types at readme \(-engine should be --engine\) `\#540 `_ (`lukaszb `_) +- Fix FilterBase so that does not override self.type for subclasses if filter_type is not specified at init (`iknite `_) -- Fix typo `\#539 `_ (`alimony `_) - -- Fix link markup `\#530 `_ (`merwok `_) - -- Add support for COMPRESS\_CSS\_HASHING\_METHOD = None `\#526 `_ (`diox `_) - -- Remove compatibility with old 'staticfiles' app `\#525 `_ (`diox `_) - -- Use get\_template\(\) when dealing with django templates `\#524 `_ (`diox `_) - -- Fix FilterBase clears self.type for subclasses `\#479 `_ (`iknite `_) - -- Remove unnecessary filename and existence checks in CssAbsoluteFilter `\#471 `_ (`agriffis `_) - -- Fix minor typographical error in docs/index `\#594 `_ (`varunsharma `_) - -- Fix deprecation warning `\#548 `_ (`davidfischer-ch `_) - -- Add "enabled" override to compress template tag `\#547 `_ (`davidfischer-ch `_) - -- CSSO support `\#538 `_ (`vovanbo `_) - -- quote filename in command `\#536 `_ (`MikeAmy `_) - -- quote filename e.g. in case it contains spaces `\#535 `_ (`MikeAmy `_) - -- Put charset back into kwargs `\#523 `_ (`zmetcalf `_) - -- Fix bug with css compress for static files `\#504 `_ (`rogaha `_) - -- Support for async/defer tags `\#482 `_ (`hkpeprah `_) - -- resolve \[issue 171\] : offline compressor to compress 'compress tags' if those are not in child template but in parent template. `\#436 `_ (`sjiitr `_) - -- Don't leave `compressed` in the render context `\#354 `_ (`gavinwahl `_) - -- Adding support to ignore some file paths during offline compression `\#335 `_ (`ayadav `_) - -- Use django.template.loader.get\_template\(\) in compress management command `\#282 `_ (`mattpatey `_) - -- Compress selected templates `\#248 `_ (`jaap3 `_) - -- re-implementing default documented behaviour for uncompressable files, fixes \#241 `\#246 `_ (`ssaboum `_) +- Remove unnecessary filename and existence checks in CssAbsoluteFilter (`agriffis `_) v1.4 (06/20/2014) From 92e7a85855cb9d6faf9a12decaa2e9fef3d7a874 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Thu, 16 Apr 2015 10:31:30 +0200 Subject: [PATCH 4/5] Removed links to contributot profiles. --- docs/changelog.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index d127636..07864df 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -6,33 +6,33 @@ v1.5 (03/27/2015) `Full Changelog `_ -- Fix compress command and run automated tests for Django 1.8 (`carltongibson `_) +- Fix compress command and run automated tests for Django 1.8 -- Fix Django 1.8 warnings (`sdfsdhgjkbmnmxc `_) +- Fix Django 1.8 warnings -- Handle TypeError from import_module (`blueyed `_) +- Handle TypeError from import_module -- Fix reading UTF-8 files which have BOM (`JereMalinen `_) +- Fix reading UTF-8 files which have BOM -- Fix incompatibility with Windows (shell_quote is not supported) (`thenewguy `_) +- Fix incompatibility with Windows (shell_quote is not supported) -- Run automated tests on Django 1.7 (`frewsxcv `_) +- Run automated tests on Django 1.7 -- Ignore non-existent {{ block.super }} in offline compression instead of raising AttributeError (`cbjadwani `_) +- Ignore non-existent {{ block.super }} in offline compression instead of raising AttributeError -- Support for clean-css (`vovanbo `_) +- Support for clean-css -- Fix link markup (`@merwok `_) +- Fix link markup -- Add support for COMPRESS_CSS_HASHING_METHOD = None (`diox `_) +- Add support for COMPRESS_CSS_HASHING_METHOD = None -- Remove compatibility with old 'staticfiles' app (`diox `_) +- Remove compatibility with old 'staticfiles' app -- In compress command, use get_template() instead of opening template files manually, fixing compatibility issues with custom template loaders (`diox `_) +- In compress command, use get_template() instead of opening template files manually, fixing compatibility issues with custom template loaders -- Fix FilterBase so that does not override self.type for subclasses if filter_type is not specified at init (`iknite `_) +- Fix FilterBase so that does not override self.type for subclasses if filter_type is not specified at init -- Remove unnecessary filename and existence checks in CssAbsoluteFilter (`agriffis `_) +- Remove unnecessary filename and existence checks in CssAbsoluteFilter v1.4 (06/20/2014) From d4ed174936e38520a01af0d65d7ff4ae0bf61fe5 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Thu, 16 Apr 2015 10:35:30 +0200 Subject: [PATCH 5/5] Small changes to contributing notes. --- docs/contributing.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/contributing.txt b/docs/contributing.txt index 225a1ae..8f0cd50 100644 --- a/docs/contributing.txt +++ b/docs/contributing.txt @@ -9,11 +9,12 @@ tidy, everybody has to follow a few rules (nothing major, I promise :) ) Community --------- -People interested in developing for the Django Compressor should head -over to #django-compressor on the `freenode`_ IRC network for help and to -discuss the development. +People interested in developing for the Django Compressor should: + +1. Head over to #django-compressor on the `freenode`_ IRC network for help and to +discuss the development. +2. Open an issue on GitHub explaining your ideas. -You may also be interested in following `@jezdez`_ on Twitter. In a nutshell ------------- @@ -143,7 +144,7 @@ Documentation should be: - Accessible. You should assume the reader to be moderately familiar with Python and Django, but not anything else. Link to documentation of libraries you use, for example, even if they are "obvious" to you. A brief - description of what it does is also welcome. + description of what it does is also welcome. Pulling of documentation is pretty fast and painless. Usually somebody goes over your text and merges it, since there are no "breaks" and that github