summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-12-14 10:12:37 +0000
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-12-14 10:12:37 +0000
commit344be5a00622814da4881df884d1557867dd20e7 (patch)
treebfc7985f949927bc4eeb8500b22edf670e21c5ba
parentf59d0cbbde2c61a09907f1a391aa55d5af3a2e1c (diff)
parent67593ac466d2e5f562c9def91778fdd34e6f5bf0 (diff)
downloadpython-master.tar.gz
python-master.tar.xz
Merge branch 'python-bump' into 'master'HEADmaster
Python bump See merge request exherbo/python!6
-rw-r--r--packages/dev-python/html5lib/files/1e6148340ac219adf2a4b30ec87f9abb8d47e252.patch66
-rw-r--r--packages/dev-python/html5lib/html5lib-1.0.1.exheres-0 (renamed from packages/dev-python/html5lib/html5lib-1.0_beta10-r1.exheres-0)8
-rw-r--r--packages/dev-python/pylint/pylint-1.7.5.exheres-0 (renamed from packages/dev-python/pylint/pylint-1.7.4.exheres-0)6
-rw-r--r--packages/dev-python/pylint/pylint.exlib5
-rw-r--r--packages/dev-python/pytest/pytest-3.3.1.exheres-0 (renamed from packages/dev-python/pytest/pytest-3.3.0.exheres-0)0
-rw-r--r--packages/dev-python/setuptools/setuptools-38.2.4.exheres-0 (renamed from packages/dev-python/setuptools/setuptools-38.2.3.exheres-0)0
6 files changed, 7 insertions, 78 deletions
diff --git a/packages/dev-python/html5lib/files/1e6148340ac219adf2a4b30ec87f9abb8d47e252.patch b/packages/dev-python/html5lib/files/1e6148340ac219adf2a4b30ec87f9abb8d47e252.patch
deleted file mode 100644
index f6bc61c..0000000
--- a/packages/dev-python/html5lib/files/1e6148340ac219adf2a4b30ec87f9abb8d47e252.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Upstream: submitted, https://github.com/html5lib/html5lib-python/pull/318
-
-From 1e6148340ac219adf2a4b30ec87f9abb8d47e252 Mon Sep 17 00:00:00 2001
-From: Benedikt Morbach <benedikt.morbach@googlemail.com>
-Date: Sat, 18 Feb 2017 01:37:24 +0100
-Subject: [PATCH] make compatible with python 3.6
-
-errors on invalid escape sequences in strings, such as "\s"
-
-i.e. anything not mentioned in https://docs.python.org/3/reference/lexical_analysis.html#strings
----
- html5lib/filters/sanitizer.py | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/html5lib/filters/sanitizer.py b/html5lib/filters/sanitizer.py
-index b5ddcb9..dc80166 100644
---- a/html5lib/filters/sanitizer.py
-+++ b/html5lib/filters/sanitizer.py
-@@ -782,7 +782,7 @@ def allowed_token(self, token):
- # characters, nor why we call unescape. I just know it's always been here.
- # Should you be worried by this comment in a sanitizer? Yes. On the other hand, all
- # this will do is remove *more* than it otherwise would.
-- val_unescaped = re.sub("[`\x00-\x20\x7f-\xa0\s]+", '',
-+ val_unescaped = re.sub("[`\x00-\x20\x7f-\xa0\\s]+", '',
- unescape(attrs[attr])).lower()
- # remove replacement characters from unescaped characters
- val_unescaped = val_unescaped.replace("\ufffd", "")
-@@ -807,7 +807,7 @@ def allowed_token(self, token):
- ' ',
- unescape(attrs[attr]))
- if (token["name"] in self.svg_allow_local_href and
-- (namespaces['xlink'], 'href') in attrs and re.search('^\s*[^#\s].*',
-+ (namespaces['xlink'], 'href') in attrs and re.search(r'^\s*[^#\s].*',
- attrs[(namespaces['xlink'], 'href')])):
- del attrs[(namespaces['xlink'], 'href')]
- if (None, 'style') in attrs:
-@@ -837,16 +837,16 @@ def disallowed_token(self, token):
-
- def sanitize_css(self, style):
- # disallow urls
-- style = re.compile('url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ', style)
-+ style = re.compile(r'url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ', style)
-
- # gauntlet
-- if not re.match("""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style):
-+ if not re.match(r"""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style):
- return ''
-- if not re.match("^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$", style):
-+ if not re.match(r"^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$", style):
- return ''
-
- clean = []
-- for prop, value in re.findall("([-\w]+)\s*:\s*([^:;]*)", style):
-+ for prop, value in re.findall(r"([-\w]+)\s*:\s*([^:;]*)", style):
- if not value:
- continue
- if prop.lower() in self.allowed_css_properties:
-@@ -855,7 +855,7 @@ def sanitize_css(self, style):
- 'padding']:
- for keyword in value.split():
- if keyword not in self.allowed_css_keywords and \
-- not re.match("^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$", keyword): # noqa
-+ not re.match(r"^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$", keyword): # noqa
- break
- else:
- clean.append(prop + ': ' + value + ';')
diff --git a/packages/dev-python/html5lib/html5lib-1.0_beta10-r1.exheres-0 b/packages/dev-python/html5lib/html5lib-1.0.1.exheres-0
index 1e8e961..5b2e25a 100644
--- a/packages/dev-python/html5lib/html5lib-1.0_beta10-r1.exheres-0
+++ b/packages/dev-python/html5lib/html5lib-1.0.1.exheres-0
@@ -1,9 +1,7 @@
# Copyright 2012 Ingmar Vanhassel <ingmar@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-MY_PV=${PV/_beta/b}
-MY_PNV=${PN}-${MY_PV}
-require pypi setup-py [ import=setuptools test=pytest work=${MY_PNV} ]
+require pypi setup-py [ import=setuptools test=pytest ]
SUMMARY="HTML parser based on the WHAT-WG Web Applications 1.0(\"HTML5\") specifcation"
@@ -18,10 +16,8 @@ DEPENDENCIES="
dev-python/webencodings[python_abis:*(-)?]
test:
dev-python/mock[python_abis:*(-)?]
- dev-python/pytest-expect[~>1.1][python_abis:*(-)?]
+ dev-python/pytest-expect[>=1.1&<2][python_abis:*(-)?]
suggestion:
dev-python/lxml[python_abis:*(-)?] [[ description = [ Support the lxml tree format ] ]]
"
-DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/1e6148340ac219adf2a4b30ec87f9abb8d47e252.patch )
-
diff --git a/packages/dev-python/pylint/pylint-1.7.4.exheres-0 b/packages/dev-python/pylint/pylint-1.7.5.exheres-0
index 6d71ae9..2ff1f41 100644
--- a/packages/dev-python/pylint/pylint-1.7.4.exheres-0
+++ b/packages/dev-python/pylint/pylint-1.7.5.exheres-0
@@ -6,10 +6,6 @@ require pylint
SLOT="0"
PLATFORMS="~amd64"
-DEPENDENCIES+="
- test+run:
- dev-python/astroid[>=1.5.1][python_abis:*(-)?]"
-
-# TODO: Multiple tests fail ( namely pylint/test/test_self.py ), as of 1.7.4
+# TODO: Multiple tests of pylint/test/test_self.py fail as of 1.7.5
RESTRICT="test"
diff --git a/packages/dev-python/pylint/pylint.exlib b/packages/dev-python/pylint/pylint.exlib
index 5838b3b..b1da5f1 100644
--- a/packages/dev-python/pylint/pylint.exlib
+++ b/packages/dev-python/pylint/pylint.exlib
@@ -24,12 +24,15 @@ DEPENDENCIES="
build+run:
python_abis:2.7? (
dev-python/backports-functools_lru_cache[python_abis:2.7]
- dev-python/configparser[python_abis:2.7] )
+ dev-python/configparser[python_abis:2.7]
+ dev-python/singledispatch[python_abis:2.7]
+ )
run:
dev-python/isort[>=4.2.5][python_abis:*(-)?]
dev-python/mccabe[python_abis:*(-)?]
dev-python/six[python_abis:*(-)?]
test+run:
+ dev-python/astroid[>=1.5.1][python_abis:*(-)?]
dev-python/logilab-common[python_abis:*(-)?]
test:
dev-python/pytest-runner[python_abis:*(-)?]
diff --git a/packages/dev-python/pytest/pytest-3.3.0.exheres-0 b/packages/dev-python/pytest/pytest-3.3.1.exheres-0
index 35ff34a..35ff34a 100644
--- a/packages/dev-python/pytest/pytest-3.3.0.exheres-0
+++ b/packages/dev-python/pytest/pytest-3.3.1.exheres-0
diff --git a/packages/dev-python/setuptools/setuptools-38.2.3.exheres-0 b/packages/dev-python/setuptools/setuptools-38.2.4.exheres-0
index fe48852..fe48852 100644
--- a/packages/dev-python/setuptools/setuptools-38.2.3.exheres-0
+++ b/packages/dev-python/setuptools/setuptools-38.2.4.exheres-0