This is an automated email from the ASF dual-hosted git repository.
tvb pushed a change to branch bschubert/update-coverage
in repository https://gitbox.apache.org/repos/asf/buildstream.git.
at 781e6d8 .gitlab-ci.yml: Run python3.8 and 3.9 tests with coverage
This branch includes the following new commits:
new 81c45e9 requirements: Update all requirements
new 3d1e0d2 .coveragerc: Also use 'threading' for concurrency
new 781e6d8 .gitlab-ci.yml: Run python3.8 and 3.9 tests with coverage
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
This is an automated email from the ASF dual-hosted git repository.
tvb 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
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a commit to branch bschubert/update-coverage
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 3d1e0d28f509852b54bcdf1e1ca0edb5be0ef4a9
Author: Benjamin Schubert <bs...@bloomberg.net>
AuthorDate: Mon Nov 30 22:03:36 2020 +0000
.coveragerc: Also use 'threading' for concurrency
---
.coveragerc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.coveragerc b/.coveragerc
index 5b06d81..4d032b4 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,5 +1,8 @@
[run]
-concurrency = multiprocessing
+concurrency =
+ threading
+ multiprocessing
+
plugins = Cython.Coverage
omit =
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a commit to branch bschubert/update-coverage
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 781e6d806168fc11fcb6e1e8acb67594a3487447
Author: Benjamin Schubert <bs...@bloomberg.net>
AuthorDate: Mon Nov 30 22:06:47 2020 +0000
.gitlab-ci.yml: Run python3.8 and 3.9 tests with coverage
Now that we are using a threaded scheduler, coverage works with
python3.8 and python3.9
---
.gitlab-ci.yml | 4 ++--
tox.ini | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2031e27..b78b7ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ variables:
INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache"
PYTEST_ARGS: "--color=yes --integration -n 2"
TEST_COMMAND: "tox -- ${PYTEST_ARGS}"
- TOXENV: py36, py37, py38-nocover, py39-nocover, py36-plugins, py37-plugins, py38-plugins-nocover, py39-plugins-nocover
+ TOXENV: py36, py37, py38, py39, py36-plugins, py37-plugins, py38-plugins, py39-plugins
COVERAGE_PREFIX: "${CI_JOB_NAME}."
@@ -364,7 +364,7 @@ overnight-randomized:
- chown -R buildstream:buildstream .
# Don't run tests multiprocessed here, the randomized order doesn't like that
- - su buildstream -c "tox -e py36-randomized,py37-randomized,py38-randomized-nocover -- --color=yes --integration"
+ - su buildstream -c "tox -e py36-randomized,py37-randomized,py38-randomized,py39-randomized -- --color=yes --integration"
# We need to override the exclusion from the template in order to run on schedules
except: []
diff --git a/tox.ini b/tox.ini
index c06d17b..a50f594 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
# Tox global configuration
#
[tox]
-envlist = py{36,37},py38-nocover,py39-nocover
+envlist = py{36,37,38,39}
skip_missing_interpreters = true
isolated_build = true