You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by gi...@apache.org on 2020/12/29 13:07:49 UTC
[buildstream] 01/03: requirements: Update all requirements
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch bschubert/update-coverage
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 81c45e91109dbffbc9e25fa38fae4e4615b31bcb
Author: Benjamin Schubert <bs...@bloomberg.net>
AuthorDate: Fri Dec 4 17:51:12 2020 +0000
requirements: Update all requirements
* .pylintrc: Disable new `raise-missing-from` check. We might want to
enable that later, but it fails in many places. Let's not merge both
changes here.
* pluginoriginpip.py: Catch the newer thrown exception from
pkg_resources. The previous one still exists, so we should be good
keeping the same compatibility as before
---
.pylintrc | 4 ++++
requirements/cov-requirements.txt | 16 ++++++----------
requirements/dev-requirements.txt | 20 ++++++++------------
requirements/requirements.txt | 16 ++++++++--------
src/buildstream/_pluginfactory/pluginoriginpip.py | 7 ++++++-
5 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/.pylintrc b/.pylintrc
index 806a113..56aa38c 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -118,6 +118,10 @@ disable=#####################################
unused-argument,
+ # This is good to get context on exceptions, we should enable that
+ # at some point
+ raise-missing-from,
+
##################################################
# Formatting-related messages, enforced by Black #
##################################################
diff --git a/requirements/cov-requirements.txt b/requirements/cov-requirements.txt
index 3296a3f..24a5cb9 100644
--- a/requirements/cov-requirements.txt
+++ b/requirements/cov-requirements.txt
@@ -1,16 +1,12 @@
coverage==4.4
-pytest-cov==2.10.0
-pytest==6.0.1
+pytest-cov==2.10.1
+pytest==6.1.2
Cython==0.29.21
## The following requirements were added by pip freeze:
-attrs==19.3.0
-importlib-metadata==1.7.0
-iniconfig==1.0.1
-more-itertools==8.4.0
-packaging==20.4
+attrs==20.3.0
+iniconfig==1.1.1
+packaging==20.7
pluggy==0.13.1
py==1.9.0
pyparsing==2.4.7
-six==1.15.0
-toml==0.10.1
-zipp==3.1.0
+toml==0.10.2
diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt
index b6b9e83..5ad8be9 100644
--- a/requirements/dev-requirements.txt
+++ b/requirements/dev-requirements.txt
@@ -1,31 +1,27 @@
pexpect==4.8.0
-pylint==2.5.3
+pylint==2.6.0
# Pytest 6.0.0 doesn't play well with pylint
-pytest==6.0.1
+pytest==6.1.2
pytest-datafiles==2.0
pytest-env==0.6.2
-pytest-xdist==1.34.0
+pytest-xdist==2.1.0
pytest-timeout==1.4.2
pyftpdlib==1.5.6
## The following requirements were added by pip freeze:
apipkg==1.5
astroid==2.4.2
-attrs==19.3.0
+attrs==20.3.0
execnet==1.7.1
-importlib-metadata==1.7.0
-iniconfig==1.0.1
-isort==4.3.21
+iniconfig==1.1.1
+isort==5.6.4
lazy-object-proxy==1.4.3
mccabe==0.6.1
-more-itertools==8.4.0
-packaging==20.4
+packaging==20.7
pluggy==0.13.1
ptyprocess==0.6.0
py==1.9.0
pyparsing==2.4.7
pytest-forked==1.3.0
six==1.15.0
-toml==0.10.1
-typed-ast==1.4.1
+toml==0.10.2
wrapt==1.12.1
-zipp==3.1.0
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 57063c0..0d4f7d7 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,15 +1,15 @@
-grpcio==1.30.0
+click==7.1.2
+grpcio==1.34.0
Jinja2==2.11.2
pluginbase==1.0.0
-protobuf==3.12.4
-psutil==5.7.2
-ruamel.yaml==0.16.10
-ruamel.yaml.clib==0.2.0
-setuptools==41.6.0
+protobuf==3.14.0
+psutil==5.7.3
+ruamel.yaml==0.16.12
+ruamel.yaml.clib==0.2.2
+setuptools==49.1.3
pyroaring==0.2.9
-ujson==3.1.0
+ujson==4.0.1
python-dateutil==2.8.1
## The following requirements were added by pip freeze:
-click==7.1.2
MarkupSafe==1.1.1
six==1.15.0
diff --git a/src/buildstream/_pluginfactory/pluginoriginpip.py b/src/buildstream/_pluginfactory/pluginoriginpip.py
index 59b5d52..0db091f 100644
--- a/src/buildstream/_pluginfactory/pluginoriginpip.py
+++ b/src/buildstream/_pluginfactory/pluginoriginpip.py
@@ -63,7 +63,12 @@ class PluginOriginPip(PluginOrigin):
detail=e.report(),
reason="package-version-conflict",
) from e
- except pkg_resources.RequirementParseError as e:
+ except (
+ # For setuptools < 49.0.0
+ pkg_resources.RequirementParseError,
+ # For setuptools >= 49.0.0
+ pkg_resources.extern.packaging.requirements.InvalidRequirement,
+ ) as e:
raise PluginError(
"{}: Malformed package-name '{}' encountered: {}".format(
self.provenance_node.get_provenance(), self._package_name, e