This is an automated email from the ASF dual-hosted git repository.
akitouni pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/buildstream.git
The following commit(s) were added to refs/heads/master by this push:
new e6676b7 update requirements (and fix new linter errors)
new fa5d816 Merge pull request #1592 from abderrahim/reqs
e6676b7 is described below
commit e6676b72b99b4b13fa21a1df82687f861c5c0d36
Author: Abderrahim Kitouni <[email protected]>
AuthorDate: Tue Feb 15 12:29:58 2022 +0100
update requirements (and fix new linter errors)
---
requirements/cov-requirements.txt | 14 +++++++-------
requirements/dev-requirements.txt | 31 ++++++++++++++++---------------
requirements/requirements.txt | 13 +++++++------
src/buildstream/_frontend/widget.py | 2 +-
src/buildstream/element.py | 2 +-
tests/sourcecache/staging.py | 2 +-
6 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/requirements/cov-requirements.txt
b/requirements/cov-requirements.txt
index c2cb6f8..188a70f 100644
--- a/requirements/cov-requirements.txt
+++ b/requirements/cov-requirements.txt
@@ -1,12 +1,12 @@
coverage==4.4
pytest-cov==2.10.1
-pytest==6.2.5
-Cython==0.29.24
+pytest==7.0.1
+Cython==0.29.27
## The following requirements were added by pip freeze:
-attrs==21.2.0
+attrs==21.4.0
iniconfig==1.1.1
-packaging==21.0
+packaging==21.3
pluggy==1.0.0
-py==1.10.0
-pyparsing==3.0.3
-toml==0.10.2
+py==1.11.0
+pyparsing==3.0.7
+tomli==2.0.1
diff --git a/requirements/dev-requirements.txt
b/requirements/dev-requirements.txt
index 10969a4..3e7e972 100644
--- a/requirements/dev-requirements.txt
+++ b/requirements/dev-requirements.txt
@@ -1,27 +1,28 @@
pexpect==4.8.0
-pylint==2.11.1
+pylint==2.12.2
# Pytest 6.0.0 doesn't play well with pylint
-pytest==6.2.5
+pytest==7.0.1
pytest-datafiles==2.0
pytest-env==0.6.2
-pytest-xdist==2.4.0
-pytest-timeout==2.0.1
+pytest-xdist==2.5.0
+pytest-timeout==2.1.0
pyftpdlib==1.5.6
## The following requirements were added by pip freeze:
-astroid==2.8.4
-attrs==21.2.0
+astroid==2.9.3
+attrs==21.4.0
execnet==1.9.0
iniconfig==1.1.1
-isort==5.9.3
-lazy-object-proxy==1.6.0
+isort==5.10.1
+lazy-object-proxy==1.7.1
mccabe==0.6.1
-packaging==21.0
-platformdirs==2.4.0
+packaging==21.3
+platformdirs==2.5.0
pluggy==1.0.0
ptyprocess==0.7.0
-py==1.10.0
-pyparsing==3.0.3
-pytest-forked==1.3.0
+py==1.11.0
+pyparsing==3.0.7
+pytest-forked==1.4.0
toml==0.10.2
-typing-extensions==3.10.0.2
-wrapt==1.13.2
+tomli==2.0.1
+typing_extensions==4.1.1
+wrapt==1.13.3
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 775479c..c0be4a4 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,15 +1,16 @@
click==8.0.3
#
+# We are experiencing crashes with grpcio >= 1.39
grpcio==1.38.1
-Jinja2==3.0.2
+Jinja2==3.0.3
pluginbase==1.0.1
-protobuf==3.19.1
-psutil==5.8.0
-ruamel.yaml==0.17.16
+protobuf==3.19.4
+psutil==5.9.0
+ruamel.yaml==0.17.21
ruamel.yaml.clib==0.2.6
-setuptools==44.1.1
+setuptools==59.6.0
pyroaring==0.3.3
-ujson==4.2.0
+ujson==5.1.0
python-dateutil==2.8.2
## The following requirements were added by pip freeze:
MarkupSafe==2.0.1
diff --git a/src/buildstream/_frontend/widget.py
b/src/buildstream/_frontend/widget.py
index 8214463..aad8892 100644
--- a/src/buildstream/_frontend/widget.py
+++ b/src/buildstream/_frontend/widget.py
@@ -951,7 +951,7 @@ class LogLine(Widget):
value_list = "\n\t" + "\n\t".join(rendered_files)
- if rendered_files == []:
+ if not rendered_files:
message = "\n\tThis element has no associated artifacts"
if style_value:
text += self.content_profile.fmt(message)
diff --git a/src/buildstream/element.py b/src/buildstream/element.py
index 3b526ed..a53ab33 100644
--- a/src/buildstream/element.py
+++ b/src/buildstream/element.py
@@ -814,7 +814,7 @@ class Element(Plugin):
# containing element that have been visited for the `_Scope.BUILD` case
# and the second one relating to the `_Scope.RUN` case.
if not recurse:
- result: Set[Element] = set()
+ result: Set["Element"] = set()
if scope in (_Scope.BUILD, _Scope.ALL):
for dep in self.__build_dependencies:
if dep not in result:
diff --git a/tests/sourcecache/staging.py b/tests/sourcecache/staging.py
index 9bc9dd4..09ff608 100644
--- a/tests/sourcecache/staging.py
+++ b/tests/sourcecache/staging.py
@@ -160,7 +160,7 @@ def test_staged_source_build(tmpdir, datafiles, cli):
files = []
for _, _, filename in os.walk(source_dir):
files.extend(filename)
- assert files == []
+ assert not files, files
# Now remove the source refs and check the state
shutil.rmtree(source_protos)
