Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23093785 Upgrade django_compressor to 2.0
authorLaszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:48:28 -0700
changeset 6780 753fc1140d2a
parent 6779 bf5dfa70d3b9
child 6781 0692a9a0923c
23093785 Upgrade django_compressor to 2.0
components/python/django_compressor/Makefile file | annotate | diff | comparison | revisions
components/python/django_compressor/django_compressor-PYVER.p5m file | annotate | diff | comparison | revisions 
--- a/components/python/django_compressor/Makefile	Wed Sep 07 14:48:27 2016 -0700
+++ b/components/python/django_compressor/Makefile	Wed Sep 07 14:48:28 2016 -0700
@@ -20,24 +20,24 @@
 #
 
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		django_compressor
-COMPONENT_VERSION=	1.4
+COMPONENT_VERSION=	2.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:b26034230efcef7d60e5267890eda656dfc49c567f27125d907eee4fe7f9a6ec
+    sha256:b1618260798e0c26ef52c8e6c14d445783756eca92f2ab1b8db8bee8ecc9b8c3
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	http://django-compressor.readthedocs.org
 COMPONENT_BUGDB=	python-mod/django-cmpress
 
-TPNO=			21719
+TPNO=			27967
 
-# Depends on django, which is not Python 3 ready.
+# Depends on django which is not Python 3 ready.
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
 
 include $(WS_MAKE_RULES)/prep.mk
@@ -54,4 +54,4 @@
 # unittests require django-discover-runner which is not integrated
 test:		$(NO_TESTS)
 
-system-test:    $(NO_TESTS)
+system-test:	$(NO_TESTS)
--- a/components/python/django_compressor/django_compressor-PYVER.p5m	Wed Sep 07 14:48:27 2016 -0700
+++ b/components/python/django_compressor/django_compressor-PYVER.p5m	Wed Sep 07 14:48:28 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -50,20 +50,12 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/cleancss.py
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/closure.py
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/css_default.py
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/cssmin/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/cssmin/cssmin.py
-file \
-    path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/cssmin/rcssmin.py \
-    pkg.depend.bypass-generate=.*/_rcssmin.*
-file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/csstidy.py
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/datauri.py
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/jsmin/__init__.py
-file \
-    path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/jsmin/rjsmin.py \
-    pkg.depend.bypass-generate=.*/_rjsmin.*
-file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/jsmin/slimit.py
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/template.py
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/yuglify.py
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/yui.py
@@ -91,10 +83,10 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/templates/compressor/js_inline.html
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/templatetags/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/templatetags/compress.py
+file path=usr/lib/python$(PYVER)/vendor-packages/compressor/test_settings.py
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/utils/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/utils/decorators.py
 file path=usr/lib/python$(PYVER)/vendor-packages/compressor/utils/staticfiles.py
-file path=usr/lib/python$(PYVER)/vendor-packages/compressor/utils/stringformat.py
 file path=usr/lib/python$(PYVER)/vendor-packages/django_compressor-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/django_compressor-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/django_compressor-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
@@ -104,6 +96,10 @@
 #
 license django_compressor.license license="BSD, MIT, Apache 2.0"
 
+# force a group dependency on the optional beautifulsoup4; pkgdepend work is
+# needed to flush this out
+depend type=group fmri=library/python/beautifulsoup4-$(PYV)
+
 # force a group dependency on the optional lxml; pkgdepend work is needed to
 # flush this out
 depend type=group fmri=library/python/lxml-$(PYV)
@@ -129,3 +125,9 @@
 
 # force a dependency on jinja2; pkgdepend work is needed to flush this out
 depend type=require fmri=library/python/jinja2-$(PYV)
+
+# force a dependency on rcssmin; pkgdepend work is needed to flush this out
+depend type=require fmri=library/python/rcssmin-$(PYV)
+
+# force a dependency on rjsmin; pkgdepend work is needed to flush this out
+depend type=require fmri=library/python/rjsmin-$(PYV)
upstream/oracle/userland-gate