# HG changeset patch # User Laszlo Peter # Date 1473284910 25200 # Node ID 22022354a440ae5a5432b78a0a3956461701c56a # Parent 51952ea948aa6428caba418c75b295f49dbe0284 23206896 Upgrade lockfile to 0.12.2 diff -r 51952ea948aa -r 22022354a440 components/python/lockfile/Makefile --- a/components/python/lockfile/Makefile Wed Sep 07 14:48:30 2016 -0700 +++ b/components/python/lockfile/Makefile Wed Sep 07 14:48:30 2016 -0700 @@ -20,21 +20,21 @@ # # -# 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= lockfile -COMPONENT_VERSION= 0.9.1 +COMPONENT_VERSION= 0.12.2 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:23da589c91f59cb7c644d5ce5df539d448341bd479917d6dde973f82e2719147 + sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799 COMPONENT_ARCHIVE_URL= $(call pypi_url) COMPONENT_PROJECT_URL= https://github.com/smontanaro/pylockfile COMPONENT_BUGDB= python-mod/lockfile -TPNO= 14503 +TPNO= 28727 include $(WS_MAKE_RULES)/prep.mk include $(WS_MAKE_RULES)/setup.py.mk @@ -55,4 +55,3 @@ test: $(NO_TESTS) system-test: $(NO_TESTS) - diff -r 51952ea948aa -r 22022354a440 components/python/lockfile/lockfile-PYVER.p5m --- a/components/python/lockfile/lockfile-PYVER.p5m Wed Sep 07 14:48:30 2016 -0700 +++ b/components/python/lockfile/lockfile-PYVER.p5m Wed Sep 07 14:48:30 2016 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# 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 \ @@ -36,12 +36,18 @@ set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=org.opensolaris.arc-caseid value=PSARC/2014/028 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -file path=usr/lib/python$(PYVER)/vendor-packages/lockfile-$(COMPONENT_VERSION)-py$(PYVER).egg-info +file path=usr/lib/python$(PYVER)/vendor-packages/lockfile-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO +file path=usr/lib/python$(PYVER)/vendor-packages/lockfile-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt +file path=usr/lib/python$(PYVER)/vendor-packages/lockfile-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt +file path=usr/lib/python$(PYVER)/vendor-packages/lockfile-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe +file path=usr/lib/python$(PYVER)/vendor-packages/lockfile-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json +file path=usr/lib/python$(PYVER)/vendor-packages/lockfile-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt file path=usr/lib/python$(PYVER)/vendor-packages/lockfile/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/lockfile/linklockfile.py file path=usr/lib/python$(PYVER)/vendor-packages/lockfile/mkdirlockfile.py file path=usr/lib/python$(PYVER)/vendor-packages/lockfile/pidlockfile.py file path=usr/lib/python$(PYVER)/vendor-packages/lockfile/sqlitelockfile.py +file path=usr/lib/python$(PYVER)/vendor-packages/lockfile/symlinklockfile.py license lockfile.license license="MIT, PSFv2" # force the rename with an optional dependency on the old name diff -r 51952ea948aa -r 22022354a440 components/python/lockfile/lockfile.license --- a/components/python/lockfile/lockfile.license Wed Sep 07 14:48:30 2016 -0700 +++ b/components/python/lockfile/lockfile.license Wed Sep 07 14:48:30 2016 -0700 @@ -17,61 +17,3 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --------------------------------------------------------------------------- - -# Copyright © 2008–2009 Ben Finney -# -# This is free software: you may copy, modify, and/or distribute this work -# under the terms of the Python Software Foundation License, version 2 or -# later as published by the Python Software Foundation. -# No warranty expressed or implied. See the file LICENSE.PSF-2 for details. - - - PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 - -1. This LICENSE AGREEMENT is between the Python Software Foundation - ("PSF"), and the Individual or Organization ("Licensee") accessing and - otherwise using this software ("Python") in source or binary form and - its associated documentation. - -2. Subject to the terms and conditions of this License Agreement, PSF - hereby grants Licensee a nonexclusive, royalty-free, world-wide - license to reproduce, analyze, test, perform and/or display publicly, - prepare derivative works, distribute, and otherwise use Python - alone or in any derivative version, provided, however, that PSF's - License Agreement and PSF's notice of copyright, i.e., "Copyright (c) - 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights - Reserved" are retained in Python alone or in any derivative version - prepared by Licensee. - -3. In the event Licensee prepares a derivative work that is based on - or incorporates Python or any part thereof, and wants to make - the derivative work available to others as provided herein, then - Licensee hereby agrees to include in any such work a brief summary of - the changes made to Python. - -4. PSF is making Python available to Licensee on an "AS IS" - basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR - IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND - DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS - FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT - INFRINGE ANY THIRD PARTY RIGHTS. - -5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON - FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS - A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, - OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material - breach of its terms and conditions. - -7. Nothing in this License Agreement shall be deemed to create any - relationship of agency, partnership, or joint venture between PSF and - Licensee. This License Agreement does not grant permission to use PSF - trademarks or trade name in a trademark sense to endorse or promote - products or services of Licensee, or any third party. - -8. By copying, installing or otherwise using Python, Licensee - agrees to be bound by the terms and conditions of this License - Agreement.