16425619 Request to update pep8 to the latest version in s12
authorRich Burridge <rich.burridge@oracle.com>
Thu, 28 Mar 2013 08:23:25 -0700
changeset 1233 4817abd9e86b
parent 1232 e550ed2e3065
child 1234 6f834970c557
16425619 Request to update pep8 to the latest version in s12 16425549 pep8 needs a man page.
components/python/pep8/Makefile
components/python/pep8/Oracle.copyright
components/python/pep8/files/pep8.1
components/python/pep8/pep8-GENFRAG.p5m
components/python/pep8/pep8-PYVER.p5m
--- a/components/python/pep8/Makefile	Thu Mar 28 07:41:58 2013 -0700
+++ b/components/python/pep8/Makefile	Thu Mar 28 08:23:25 2013 -0700
@@ -26,12 +26,12 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pep8
-COMPONENT_VERSION=	1.3.3
+COMPONENT_VERSION=	1.4.4
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=  http://pypi.python.org/pypi/pep8
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:2033a40515a52068dd719857b38ecca651ce84dc9837b99fe500f314cadab634
+    sha256:a39adf83fdeab6072117087dd5b7daa8b6a5ec254730e1c4756f1d5687145258
 COMPONENT_ARCHIVE_URL=	http://pypi.python.org/packages/source/p/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	python-mod/pep8
 
@@ -44,7 +44,15 @@
 	/usr/bin/find $(SOURCE_DIR) -name *.py \
 		-exec $(GSED) -i -e 's/env python/python$(PYTHON_VERSION)/' "{}" \; ;
 
-COMPONENT_POST_INSTALL_ACTION = \
+# Put the correct pep8 version number on the .TH line in the man page in
+# the proto area.
+COMPONENT_POST_INSTALL_ACTION += \
+	($(MKDIR) $(PROTO_DIR)/usr/share/man/man1; \
+	$(GSED) -e 's/XXX/$(COMPONENT_VERSION)/' \
+	    $(COMPONENT_DIR)/files/pep8.1 > \
+	    $(PROTO_DIR)/usr/share/man/man1/pep8.1);
+
+COMPONENT_POST_INSTALL_ACTION += \
 	(cd $(PROTO_DIR)/usr/bin ; $(MV) -f pep8 pep8-$(PYTHON_VERSION))
 
 # common targets
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pep8/Oracle.copyright	Thu Mar 28 08:23:25 2013 -0700
@@ -0,0 +1,1 @@
+Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pep8/files/pep8.1	Thu Mar 28 08:23:25 2013 -0700
@@ -0,0 +1,50 @@
+.\" This manual page is derived from documentation obtained from
+.\" http://manpages.ubuntu.com/manpages/precise/en/man1/pep8.1.html
+.TH PEP8 "1" "March 2013" "pep8 XXX" "User Commands"
+.SH NAME
+pep8 \- A tool to check your Python code against some of the style conventions in PEP 8.
+.SH SYNOPSIS
+.B pep8
+[\fIoptions\fR] \fIinput \fR...
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+print status messages, or debug with \fB\-vv\fR
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+report only file names, or nothing with \fB\-qq\fR
+.TP
+\fB\-\-exclude\fR=\fIpatterns\fR
+skip matches (default .svn,CVS,*.pyc,*.pyo)
+.TP
+\fB\-\-filename\fR=\fIpatterns\fR
+only check matching files (e.g. *.py)
+.TP
+\fB\-\-ignore\fR=\fIerrors\fR
+skip errors and warnings (e.g. E4,W)
+.TP
+\fB\-\-repeat\fR
+show all occurrences of the same error
+.TP
+\fB\-\-show\-source\fR
+show source code for each error
+.TP
+\fB\-\-show\-pep8\fR
+show text of PEP 8 for each error
+.TP
+\fB\-\-statistics\fR
+count errors and warnings
+.TP
+\fB\-\-benchmark\fR
+measure processing speed
+.TP
+\fB\-\-testsuite\fR=\fIdir\fR
+run regression tests from dir
+.TP
+\fB\-\-doctest\fR
+run doctest on myself
+.SH AUTHOR
+This manual page was written by David Watson <[email protected]>.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pep8/pep8-GENFRAG.p5m	Thu Mar 28 08:23:25 2013 -0700
@@ -0,0 +1,31 @@
+#
+# CDDL HEADER START
+#
+# 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.
+#
+# 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) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+
+dir path=usr
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/share/man/man1/pep8.1
+license Oracle.copyright license="Oracle copyright"
--- a/components/python/pep8/pep8-PYVER.p5m	Thu Mar 28 07:41:58 2013 -0700
+++ b/components/python/pep8/pep8-PYVER.p5m	Thu Mar 28 08:23:25 2013 -0700
@@ -27,7 +27,7 @@
 set name=pkg.description \
     value="pep8 is a tool to check your Python code against some of the style conventions in PEP 8 (Style Guide for Python Code)."
 set name=com.oracle.info.description value="the pep8 Python style guide checker"
-set name=com.oracle.info.tpno value=10692
+set name=com.oracle.info.tpno value=12771
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -52,7 +52,8 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pep8-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pep8-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pep8.py \
-    pkg.depend.bypass-generate=.*/configparser.*
+    pkg.depend.bypass-generate=.*/configparser.* \
+    pkg.depend.bypass-generate=.*/test_pep8.*
 license pep8.license license="expat license"
 
 # force a dependency on the pep8 package