Skip to content

Commit

Permalink
cherrypy: update to 17.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@pyhalov
pyhalov committed Oct 19, 2018
1 parent 715f4cc commit 3a647e0
Show file tree
Hide file tree
Showing 6 changed files with 446 additions and 145 deletions.
46 changes: 32 additions & 14 deletions components/python/cherrypy/Makefile
View file
Expand Up @@ -22,35 +22,53 @@
#
include ../../../make-rules/shared-macros.mk

PATH=/usr/bin:/usr/gnu/bin:/usr/sbin

COMPONENT_NAME= CherryPy
COMPONENT_VERSION= 3.1.2
# This is the last version with Python 2.7 support
COMPONENT_VERSION= 17.3.0
COMPONENT_SUMMARY= 'Pythonic, object-oriented HTTP framework'
COMPONENT_PROJECT_URL= http://www.cherrypy.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
sha256:0dfd65507b047d54c09849e7a4b8bdd3616fa8776a5dbff7697cbf6ea1559bf6
COMPONENT_ARCHIVE_URL= http://download.cherrypy.org/cherrypy/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= python-mod/cherrypy
sha256:c3e4d76232ade4c47666b9008f92556465df517b8dca833ece3bed027028ae7d
COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_FMRI= library/python/cherrypy
COMPONENT_CLASSIFICATION= Development/Python
COMPONENT_LICENSE= BSD
COMPONENT_LICENSE_FILE= LICENSE.md

PATCH_LEVEL=0
PYTHON_VERSIONS=2.7
PYTHON_VERSIONS= 2.7 3.4 3.5

include $(WS_TOP)/make-rules/prep.mk
include $(WS_TOP)/make-rules/setup.py.mk
include $(WS_TOP)/make-rules/ips.mk
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
include $(WS_MAKE_RULES)/ips.mk

COMPONENT_POST_INSTALL_ACTION = \
(cd $(PROTO_DIR)/usr/bin ; $(MV) -f cherryd cherryd$(PYTHON_VERSION))
(cd $(PROTO_DIR)/usr/bin ; $(MV) -f cherryd cherryd-$(PYTHON_VERSION))

COMPONENT_TEST_DIR = $(SOURCE_DIR)/cherrypy/test
COMPONENT_TEST_CMD = nosetests-$(PYTHON_VERSION) -s $(SOURCE_DIR)/cherrypy/test
COMPONENT_TEST_ARGS = -v

# common targets
build: $(BUILD_NO_ARCH)

install: $(INSTALL_NO_ARCH)

test: $(NO_TESTS)
test: $(TEST_NO_ARCH)

# Test requirements
REQUIRED_PACKAGES += library/python/nose-27
REQUIRED_PACKAGES += library/python/nose-34
REQUIRED_PACKAGES += library/python/nose-35

REQUIRED_PACKAGES += SUNWcs
# Auto-generated dependencies
REQUIRED_PACKAGES += library/python/setuptools-27
REQUIRED_PACKAGES += library/python/setuptools-34
REQUIRED_PACKAGES += library/python/setuptools-35
REQUIRED_PACKAGES += library/python/six-27
REQUIRED_PACKAGES += library/python/six-34
REQUIRED_PACKAGES += library/python/six-35
REQUIRED_PACKAGES += runtime/python-27
REQUIRED_PACKAGES += runtime/python-34
REQUIRED_PACKAGES += runtime/python-35
124 changes: 68 additions & 56 deletions components/python/cherrypy/cherrypy-PYVER.p5m
View file
@@ -1,135 +1,151 @@
#
# CDDL HEADER START
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END

#
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright 2018 Alexander Pyhalov
#

set name=pkg.fmri value=pkg:/library/python/cherrypy-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Pythonic, object-oriented HTTP framework"
set name=pkg.description value="CherryPy is a Pythonic, object-oriented HTTP framework"
set name=com.oracle.info.description value="the CherryPy object-oriented HTTP framework for Python $(PYVER)"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="CherryPy Team <team@cherrypy.org>"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set name=org.opensolaris.arc-caseid \
value=PSARC/2011/259

license cherrypy.copyright license=BSD
# force a dependency on the Python runtime
depend fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin type=require
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

depend type=require fmri=library/python/contextlib2-$(PYV)
depend type=require fmri=library/python/cheroot-$(PYV)
depend type=require fmri=library/python/more-itertools-$(PYV)
depend type=require fmri=library/python/portend-$(PYV)
depend type=require fmri=library/python/zc.lockfile-$(PYV)

file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-3.1.2-py$(PYVER).egg-info
link path=usr/bin/cherryd target=cherryd-$(PYVER) mediator=python mediator-version=$(PYVER)
file path=usr/bin/cherryd-$(PYVER)
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpcgifs.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/__main__.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpchecker.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpcompat.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpconfig.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpdispatch.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cperror.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cplogging.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpmodpy.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpnative_server.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpreqbody.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cprequest.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpserver.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpthreadinglocal.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cptools.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cptree.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpwsgi_server.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpwsgi.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/cherryd mode=0555
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpwsgi_server.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_helper.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/daemon.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/favicon.ico
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/auth.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/auth_basic.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/auth_digest.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/caching.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/covercp.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/cpstats.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/cptools.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/encoding.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/http.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/httpauth.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/gctools.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/httputil.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/jsontools.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/locking.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/profiler.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/safemime.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/reprconf.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/sessions.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/static.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/tidy.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/wsgiapp.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/xmlrpc.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/LICENSE.txt
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/xmlrpcutil.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/process/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/process/plugins.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/process/servers.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/process/win32.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/process/wspbus.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/scaffold/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/scaffold/apache-fcgi.conf
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/scaffold/example.conf
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/scaffold/site.conf
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/scaffold/static/made_with_cherrypy_small.png
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/_test_decorators.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/_test_states_demo.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/benchmark.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/checkerdemo.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/fastcgi.conf
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/fcgi.conf
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/helper.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/logtest.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/modfastcgi.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/modfcgid.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/modpy.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/modwsgi.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/py25.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/sessiondemo.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/static/404.html
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/static/dirback.jpg
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/static/index.html
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/style.css
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test.pem
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_auth_basic.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_auth_digest.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_bus.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_caching.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_compat.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_config.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_config_server.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_conn.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_core.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_dynamicobjectmapping.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_encoding.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_etags.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_http.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_httpauth.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_httplib.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_httputil.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_iterator.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_json.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_logging.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_mime.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_misc_tools.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_native.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_objectmapping.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_params.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_plugins.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_proxy.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_refleaks.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_request_obj.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_routes.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_safe_multipart.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_session.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_sessionauthenticate.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_states_demo.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_states.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_static.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_tidy.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_tools.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_tutorials.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_virtualhost.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_wsgi_ns.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_wsgi_unix_socket.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_wsgi_vhost.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_wsgiapps.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test_xmlrpc.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test.pem
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/test.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/test/webtest.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/tutorial/README.rst
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/tutorial/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/tutorial/bonus-sqlobject.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/tutorial/custom_error.html
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/tutorial/pdf_file.pdf
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/tutorial/README.txt
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/tutorial/tut01_helloworld.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/tutorial/tut02_expose_methods.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/tutorial/tut03_get_and_post.py
Expand All @@ -141,7 +157,3 @@ file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/tutorial/tut08_generat
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/tutorial/tut09_files.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/tutorial/tut10_http_errors.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/tutorial/tutorial.conf
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/wsgiserver/__init__.py
link path=usr/bin/cherryd \
target=../lib/python$(PYVER)/vendor-packages/cherrypy/cherryd \
mediator=python mediator-version=$(PYVER)

0 comments on commit 3a647e0

Please sign in to comment.