1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

devel/py-setuptools: update to 5.1

PR:		191257
Exp-run:	antoine
With hat:	python
This commit is contained in:
William Grzybowski 2014-06-25 19:52:30 +00:00
parent 0c63847ed6
commit 391d3163cb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=359295
5 changed files with 3 additions and 111 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= setuptools
PORTVERSION= 2.0.1
PORTVERSION= 5.1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -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-5.1.tar.gz) = 5855a13607cae9123df0981d814d32b5b413b7a20422f642bf3f4c355383485b
SIZE (python/setuptools-5.1.tar.gz) = 804805

View File

@ -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"""

View File

@ -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()

View File

@ -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)