[Midnightbsd-cvs] mports [20299] trunk/devel/py-setuptools: update python setuptools to 17
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Sep 27 13:17:52 EDT 2015
Revision: 20299
http://svnweb.midnightbsd.org/mports/?rev=20299
Author: laffer1
Date: 2015-09-27 13:17:51 -0400 (Sun, 27 Sep 2015)
Log Message:
-----------
update python setuptools to 17
Modified Paths:
--------------
trunk/devel/py-setuptools/Makefile
trunk/devel/py-setuptools/distinfo
trunk/devel/py-setuptools/files/pkg-message.in
Removed Paths:
-------------
trunk/devel/py-setuptools/files/patch-pkg_resources
trunk/devel/py-setuptools/files/patch-setuptools_command_install_egg_info.py
trunk/devel/py-setuptools/files/patch-setuptools_command_install_lib.py
trunk/devel/py-setuptools/files/patch-setuptools_command_sdist
Modified: trunk/devel/py-setuptools/Makefile
===================================================================
--- trunk/devel/py-setuptools/Makefile 2015-09-27 17:14:24 UTC (rev 20298)
+++ trunk/devel/py-setuptools/Makefile 2015-09-27 17:17:51 UTC (rev 20299)
@@ -1,49 +1,38 @@
# $MidnightBSD$
PORTNAME= setuptools
-PORTVERSION= 2.0.1
+PORTVERSION= 17.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DIST_SUBDIR= python
-MAINTAINER= ports at MidnightBSD.org
-COMMENT= Download, build, install, upgrade, and uninstall Python packages
+MAINTAINER= python at MidnightBSD.org
+COMMENT= Python packages installer
LICENSE= python
-CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}distribute-[0-9]*
+NO_ARCH= yes
+USES= python
+USE_PYTHON= autoplist concurrent distutils
-PLIST_SUB= PYVER=${PYTHON_VER} VERSION=${PORTVERSION} \
- EASYINSTALL_PTH=${PYTHON_SITELIBDIR}/easy-install.pth
-
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
PYDISTUTILS_SETUP= ${PYSETUP}
-SUB_LIST= IF_DEFAULT=${IF_DEFAULT}
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}distribute-[0-9]*
+MAKE_ENV+= SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+PLIST_SUB= EASYINSTALL_PTH=${PYTHON_SITELIBDIR}/easy-install.pth
.include <bsd.port.pre.mk>
.if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION}
SUB_FILES+= pkg-message
+SUB_LIST+= PYTHON_VER=${PYTHON_VER}
.endif
-post-patch:
-.if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION}
- @${REINPLACE_CMD} 's,.*yield "easy_install =.*,,' ${WRKSRC}/setup.py
-.endif
- @${REINPLACE_CMD} 's,#!python,#!${PYTHON_CMD},' \
- ${WRKSRC}/setuptools/command/easy_install.py
- @${REINPLACE_CMD} 's,#!/usr/bin/python,#!${PYTHON_CMD},' \
- ${WRKSRC}/setuptools/tests/test_resources.py
- @${MKDIR} ${FAKE_DESTDIR}${PYTHON_SITELIBDIR}
-
post-install:
${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${FAKE_DESTDIR}${PYTHON_SITELIBDIR}/
regression-test: build
- @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
+ @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
.include <bsd.port.post.mk>
Modified: trunk/devel/py-setuptools/distinfo
===================================================================
--- trunk/devel/py-setuptools/distinfo 2015-09-27 17:14:24 UTC (rev 20298)
+++ trunk/devel/py-setuptools/distinfo 2015-09-27 17:17:51 UTC (rev 20299)
@@ -1,2 +1,2 @@
-SHA256 (python/setuptools-2.0.1.tar.gz) = 8772b48bdd219bfbbb6eb262ba32419856e9cb4a4d8deda88cc55c28dc6124ce
-SIZE (python/setuptools-2.0.1.tar.gz) = 783570
+SHA256 (python/setuptools-17.0.tar.gz) = 561b33819ef3da2bff89cc8b05fd9b5ea3caeb31ad588b53fdf06f886ac3d200
+SIZE (python/setuptools-17.0.tar.gz) = 629845
Deleted: trunk/devel/py-setuptools/files/patch-pkg_resources
===================================================================
--- trunk/devel/py-setuptools/files/patch-pkg_resources 2015-09-27 17:14:24 UTC (rev 20298)
+++ trunk/devel/py-setuptools/files/patch-pkg_resources 2015-09-27 17:17:51 UTC (rev 20299)
@@ -1,72 +0,0 @@
-diff -r 353a42700744 -r 5b1b03dc68ce pkg_resources.py
---- pkg_resources.py Sun Dec 15 22:38:35 2013 -0500
-+++ pkg_resources.py Fri Dec 20 22:09:39 2013 +0100
-@@ -1214,6 +1214,32 @@
- return cls.interpret(parser.expr(text).totuple(1)[1])
-
- @classmethod
-+ def _markerlib_evaluate(cls, text):
-+ """
-+ Evaluate a PEP 426 environment marker using markerlib.
-+ Return a boolean indicating the marker result in this environment.
-+ Raise SyntaxError if marker is invalid.
-+ """
-+ import _markerlib
-+ # markerlib implements Metadata 1.2 (PEP 345) environment markers.
-+ # Translate the variables to Metadata 2.0 (PEP 426).
-+ env = _markerlib.default_environment()
-+ for key in env.keys():
-+ new_key = key.replace('.', '_')
-+ env[new_key] = env.pop(key)
-+ try:
-+ result = _markerlib.interpret(text, env)
-+ except NameError:
-+ e = sys.exc_info()[1]
-+ raise SyntaxError(e.args[0])
-+ return result
-+
-+ if 'parser' not in globals():
-+ # Fall back to less-complete _markerlib implementation if 'parser' module
-+ # is not available.
-+ evaluate_marker = _markerlib_evaluate
-+
-+ @classmethod
- def interpret(cls, nodelist):
- while len(nodelist)==2: nodelist = nodelist[1]
- try:
-@@ -1242,34 +1268,8 @@
- return s[1:-1]
- raise SyntaxError("Language feature not supported in environment markers")
-
--def _markerlib_evaluate(text):
-- """
-- Evaluate a PEP 426 environment marker using markerlib.
-- Return a boolean indicating the marker result in this environment.
-- Raise SyntaxError if marker is invalid.
-- """
-- import _markerlib
-- # markerlib implements Metadata 1.2 (PEP 345) environment markers.
-- # Translate the variables to Metadata 2.0 (PEP 426).
-- env = _markerlib.default_environment()
-- for key in env.keys():
-- new_key = key.replace('.', '_')
-- env[new_key] = env.pop(key)
-- try:
-- result = _markerlib.interpret(text, env)
-- except NameError:
-- e = sys.exc_info()[1]
-- raise SyntaxError(e.args[0])
-- return result
--
- invalid_marker = MarkerEvaluation.is_invalid_marker
--
--if 'parser' in globals():
-- evaluate_marker = MarkerEvaluation.evaluate_marker
--else:
-- # fallback to less-complete _markerlib implementation if 'parser' module
-- # is not available.
-- evaluate_marker = _markerlib_evaluate
-+evaluate_marker = MarkerEvaluation.evaluate_marker
-
- class NullProvider:
- """Try to implement resources and metadata for arbitrary PEP 302 loaders"""
Deleted: trunk/devel/py-setuptools/files/patch-setuptools_command_install_egg_info.py
===================================================================
--- trunk/devel/py-setuptools/files/patch-setuptools_command_install_egg_info.py 2015-09-27 17:14:24 UTC (rev 20298)
+++ trunk/devel/py-setuptools/files/patch-setuptools_command_install_egg_info.py 2015-09-27 17:17:51 UTC (rev 20299)
@@ -1,11 +0,0 @@
---- setuptools/command/install_egg_info.py.orig 2013-11-27 22:45:15.000000000 +0100
-+++ setuptools/command/install_egg_info.py 2013-11-27 22:45:23.000000000 +0100
-@@ -23,7 +23,7 @@
- ).egg_name()+'.egg-info'
- self.source = ei_cmd.egg_info
- self.target = os.path.join(self.install_dir, basename)
-- self.outputs = [self.target]
-+ self.outputs = []
-
- def run(self):
- self.run_command('egg_info')
Deleted: trunk/devel/py-setuptools/files/patch-setuptools_command_install_lib.py
===================================================================
--- trunk/devel/py-setuptools/files/patch-setuptools_command_install_lib.py 2015-09-27 17:14:24 UTC (rev 20298)
+++ trunk/devel/py-setuptools/files/patch-setuptools_command_install_lib.py 2015-09-27 17:17:51 UTC (rev 20299)
@@ -1,21 +0,0 @@
---- setuptools/command/install_lib.py.orig 2013-12-16 22:09:54.602395279 -0200
-+++ setuptools/command/install_lib.py 2013-12-16 22:10:50.052393299 -0200
-@@ -4,18 +4,6 @@
- class install_lib(_install_lib):
- """Don't add compiled flags to filenames of non-Python files"""
-
-- def _bytecode_filenames (self, py_filenames):
-- bytecode_files = []
-- for py_file in py_filenames:
-- if not py_file.endswith('.py'):
-- continue
-- if self.compile:
-- bytecode_files.append(py_file + "c")
-- if self.optimize > 0:
-- bytecode_files.append(py_file + "o")
--
-- return bytecode_files
--
- def run(self):
- self.build()
- outfiles = self.install()
Deleted: trunk/devel/py-setuptools/files/patch-setuptools_command_sdist
===================================================================
--- trunk/devel/py-setuptools/files/patch-setuptools_command_sdist 2015-09-27 17:14:24 UTC (rev 20298)
+++ trunk/devel/py-setuptools/files/patch-setuptools_command_sdist 2015-09-27 17:17:51 UTC (rev 20299)
@@ -1,15 +0,0 @@
---- setuptools/command/sdist.py.orig 2013-12-24 08:01:18.439265244 +0000
-+++ setuptools/command/sdist.py 2013-12-24 08:01:37.794263110 +0000
-@@ -35,10 +35,10 @@
- f.close()
- for match in self.pattern.finditer(data):
- path = match.group(1)
-- if postproc:
-+ if self.postproc:
- #postproc used to be used when the svn finder
- #was an re_finder for calling unescape
-- path = postproc(path)
-+ path = self.postproc(path)
- yield svn_utils.joinpath(dirname,path)
- def __call__(self, dirname=''):
- path = svn_utils.joinpath(dirname, self.path)
Modified: trunk/devel/py-setuptools/files/pkg-message.in
===================================================================
--- trunk/devel/py-setuptools/files/pkg-message.in 2015-09-27 17:14:24 UTC (rev 20298)
+++ trunk/devel/py-setuptools/files/pkg-message.in 2015-09-27 17:17:51 UTC (rev 20299)
@@ -1,7 +1,7 @@
-*********************************************************************
- The script %%PREFIX%%/bin/easy_install was already installed
- on your system, so the only script %%PREFIX%%/bin/easy_install-%%PYVER%%
- has been added.
+*******************************************************************
-*********************************************************************
+ Only %%PREFIX%%/bin/easy_install-%%PYTHON_VER%% script has been installed
+ since Python %%PYTHON_VER%% is not the default Python version.
+
+*******************************************************************
More information about the Midnightbsd-cvs
mailing list