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.
23207639 Upgrade pyScss to 1.3.4
authorLaszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:48:35 -0700
changeset 6819 dde264c0ac6e
parent 6818 4079d968549c
child 6820 a061f6d8a3eb
23207639 Upgrade pyScss to 1.3.4
components/python/pyscss/Makefile file | annotate | diff | comparison | revisions
components/python/pyscss/patches/pcre.include.patch file | annotate | diff | comparison | revisions
components/python/pyscss/pyscss-PYVER.p5m file | annotate | diff | comparison | revisions 
--- a/components/python/pyscss/Makefile	Wed Sep 07 14:48:35 2016 -0700
+++ b/components/python/pyscss/Makefile	Wed Sep 07 14:48:35 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=		pyScss
-COMPONENT_VERSION=	1.2.1
+COMPONENT_VERSION=	1.3.4
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:6f486363f5fac20d218dc5d11b8af4e5b52242a59e5067f42ca227152a7df3cc
+    sha256:d0323110ecc7d3ead6b99cfec31301306928130e4d0a9eb13226bf390aba8c0e
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	https://github.com/Kronuz/pyScss
 COMPONENT_BUGDB=	python-mod/pyscss
 
-TPNO=			20384
+TPNO=			28002
 
-# Python 3.4 has build errors.  Need to investigate...
+# Depends on python-imaging which is not Python 3 ready.
 PYTHON_VERSIONS =	$(PYTHON2_VERSIONS)
 
 include $(WS_MAKE_RULES)/prep.mk
@@ -47,7 +47,7 @@
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 COMPONENT_POST_INSTALL_ACTION = \
-	(cd $(PROTO_DIR)/usr/bin ; $(MV) -f pyscss pyscss-$(PYTHON_VERSION))
+    (cd $(PROTO_DIR)/usr/bin ; $(MV) -f pyscss pyscss-$(PYTHON_VERSION))
 
 # common targets
 build:		$(BUILD_32_and_64)
@@ -57,9 +57,9 @@
 # The tarball for this version does not ship unittests.
 test:		$(NO_TESTS)
 
-system-test:    $(NO_TESTS)
+system-test:	$(NO_TESTS)
 
 REQUIRED_PACKAGES += library/pcre
 REQUIRED_PACKAGES += library/python/pytest-27
 REQUIRED_PACKAGES += library/python/setuptools-27
-REQUIRED_PACKAGES += library/python/six-27
+REQUIRED_PACKAGES += system/library
--- a/components/python/pyscss/patches/pcre.include.patch	Wed Sep 07 14:48:35 2016 -0700
+++ b/components/python/pyscss/patches/pcre.include.patch	Wed Sep 07 14:48:35 2016 -0700
@@ -2,12 +2,12 @@
 C extension.  This patch is specific to Solaris and will not be
 submitted upstream.
 
---- pyScss-1.2.1/setup.py.orig  2014-10-16 15:24:31.617255812 -0600
-+++ pyScss-1.2.1/setup.py    2014-10-16 15:24:48.100507110 -0600
-@@ -27,7 +27,8 @@ speedups = Feature(
+--- pyScss-1.3.4/setup.py.~1~	2015-10-06 02:08:05.983360539 -0800
++++ pyScss-1.3.4/setup.py	2015-10-06 02:09:00.989466001 -0800
+@@ -33,7 +33,8 @@ speedups = Feature(
          Extension(
-             'scss._speedups',
-             sources=['scss/src/_speedups.c', 'scss/src/block_locator.c', 'scss/src/scanner.c'],
+             'scss.grammar._scanner',
+             sources=['scss/src/_speedups.c', 'scss/src/block_locator.c', 'scss/src/scanner.c', 'scss/src/hashtable.c'],
 -            libraries=['pcre']
 +            libraries=['pcre'],
 +            include_dirs = ['/usr/include/pcre']
--- a/components/python/pyscss/pyscss-PYVER.p5m	Wed Sep 07 14:48:35 2016 -0700
+++ b/components/python/pyscss/pyscss-PYVER.p5m	Wed Sep 07 14:48:35 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -48,30 +48,39 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pyScss-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pyScss-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pyScss-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/scss/64/_speedups.so \
-    pkg.depend.runpath=/lib:/usr/lib
 file path=usr/lib/python$(PYVER)/vendor-packages/scss/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/scss/__main__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/scss/_native.py
-file path=usr/lib/python$(PYVER)/vendor-packages/scss/_speedups.so
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/ast.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/calculator.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/compiler.py
 file path=usr/lib/python$(PYVER)/vendor-packages/scss/config.py
 file path=usr/lib/python$(PYVER)/vendor-packages/scss/cssdefs.py
 file path=usr/lib/python$(PYVER)/vendor-packages/scss/errors.py
-file path=usr/lib/python$(PYVER)/vendor-packages/scss/expression.py
-file path=usr/lib/python$(PYVER)/vendor-packages/scss/functions/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/scss/functions/compass/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/scss/functions/compass/gradients.py
-file path=usr/lib/python$(PYVER)/vendor-packages/scss/functions/compass/helpers.py
-file path=usr/lib/python$(PYVER)/vendor-packages/scss/functions/compass/images.py
-file path=usr/lib/python$(PYVER)/vendor-packages/scss/functions/compass/layouts.py
-file path=usr/lib/python$(PYVER)/vendor-packages/scss/functions/compass/sprites.py
-file path=usr/lib/python$(PYVER)/vendor-packages/scss/functions/core.py
-file path=usr/lib/python$(PYVER)/vendor-packages/scss/functions/extra.py
-file path=usr/lib/python$(PYVER)/vendor-packages/scss/functions/library.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/extension/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/extension/api.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/extension/bootstrap.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/extension/compass/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/extension/compass/configuration.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/extension/compass/gradients.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/extension/compass/helpers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/extension/compass/images.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/extension/compass/layouts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/extension/compass/sprites.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/extension/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/extension/extra.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/extension/fonts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/grammar/64/_scanner.so
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/grammar/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/grammar/_scanner.so
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/grammar/expression.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/grammar/scanner.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/legacy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/namespace.py
 file path=usr/lib/python$(PYVER)/vendor-packages/scss/rule.py
 file path=usr/lib/python$(PYVER)/vendor-packages/scss/scss_meta.py
 file path=usr/lib/python$(PYVER)/vendor-packages/scss/selector.py
 file path=usr/lib/python$(PYVER)/vendor-packages/scss/setup.py
+file path=usr/lib/python$(PYVER)/vendor-packages/scss/source.py
 file path=usr/lib/python$(PYVER)/vendor-packages/scss/sourcemap.py
 file path=usr/lib/python$(PYVER)/vendor-packages/scss/tool.py \
     pkg.depend.bypass-generate=.*/watchdog.*
@@ -80,14 +89,19 @@
 #
 license LICENSE license=MIT
 
-# force a dependency on the Python runtime
-depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
-    pkg.debug.depend.path=usr/bin
+# force a group dependency on the optional python-imaging; pkgdepend work is
+# needed to flush this out.
+depend type=group fmri=library/python/python-imaging-$(PYV)
+
+# force a dependency on enum; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/enum-$(PYV)
+
+# force a dependency on pathlib; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pathlib-$(PYV)
 
 # force a dependency on the pyscss package
 depend type=require \
     fmri=library/python/pyscss@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
-# force a dependency on python-imaging; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python/python-imaging-$(PYV)
+# force a dependency on six; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/six-$(PYV)
upstream/oracle/userland-gate