summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.pylintrc2
-rw-r--r--requirements/cov-requirements.txt21
-rw-r--r--requirements/dev-requirements.txt27
-rw-r--r--requirements/plugin-requirements.txt1
-rw-r--r--requirements/requirements.txt16
-rw-r--r--src/buildstream/testing/_utils/junction.py2
-rw-r--r--tests/testutils/repo/git.py2
7 files changed, 36 insertions, 35 deletions
diff --git a/.pylintrc b/.pylintrc
index 422406417..25d5647b0 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -106,6 +106,8 @@ disable=#####################################
#######################################################
# Messages that we would like to enable at some point #
#######################################################
+ # We have many circular imports that need breaking
+ import-outside-toplevel,
duplicate-code,
diff --git a/requirements/cov-requirements.txt b/requirements/cov-requirements.txt
index bf2b5112a..c700ababf 100644
--- a/requirements/cov-requirements.txt
+++ b/requirements/cov-requirements.txt
@@ -1,16 +1,15 @@
coverage==4.4
-pytest-cov==2.7.1
-Cython==0.29.13
+pytest-cov==2.8.1
+Cython==0.29.14
## The following requirements were added by pip freeze:
-atomicwrites==1.3.0
-attrs==19.1.0
-importlib-metadata==0.20
-more-itertools==7.2.0
-packaging==19.1
-pluggy==0.12.0
+attrs==19.3.0
+importlib-metadata==1.1.0
+more-itertools==8.0.0
+packaging==19.2
+pluggy==0.13.1
py==1.8.0
-pyparsing==2.4.2
-pytest==5.1.2
-six==1.12.0
+pyparsing==2.4.5
+pytest==5.3.1
+six==1.13.0
wcwidth==0.1.7
zipp==0.6.0
diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt
index bd8449978..a9c265c85 100644
--- a/requirements/dev-requirements.txt
+++ b/requirements/dev-requirements.txt
@@ -1,27 +1,26 @@
-pylint==2.3.1
-pytest==5.1.2
+pylint==2.4.4
+pytest==5.3.1
pytest-datafiles==2.0
pytest-env==0.6.2
-pytest-xdist==1.29.0
+pytest-xdist==1.30.0
pytest-timeout==1.3.3
pyftpdlib==1.5.5
## The following requirements were added by pip freeze:
apipkg==1.5
-astroid==2.2.5
-atomicwrites==1.3.0
-attrs==19.1.0
+astroid==2.3.3
+attrs==19.3.0
execnet==1.7.1
-importlib-metadata==0.20
+importlib-metadata==1.1.0
isort==4.3.21
-lazy-object-proxy==1.4.2
+lazy-object-proxy==1.4.3
mccabe==0.6.1
-more-itertools==7.2.0
-packaging==19.1
-pluggy==0.12.0
+more-itertools==8.0.0
+packaging==19.2
+pluggy==0.13.1
py==1.8.0
-pyparsing==2.4.2
-pytest-forked==1.0.2
-six==1.12.0
+pyparsing==2.4.5
+pytest-forked==1.1.3
+six==1.13.0
typed-ast==1.4.0
wcwidth==0.1.7
wrapt==1.11.2
diff --git a/requirements/plugin-requirements.txt b/requirements/plugin-requirements.txt
index ac984746d..950062f73 100644
--- a/requirements/plugin-requirements.txt
+++ b/requirements/plugin-requirements.txt
@@ -1 +1,2 @@
arpy==1.1.1
+## The following requirements were added by pip freeze:
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 7d3d5d6c7..962090823 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,14 +1,14 @@
Click==7.0
-grpcio==1.23.0
-Jinja2==2.10.1
+grpcio==1.25.0
+Jinja2==2.10.3
pluginbase==1.0.0
-protobuf==3.9.1
-psutil==5.6.3
+protobuf==3.11.0
+psutil==5.6.7
ruamel.yaml==0.16.5
-setuptools==40.8.0
-pyroaring==0.2.8
+setuptools==39.0.1
+pyroaring==0.2.9
ujson==1.35
## The following requirements were added by pip freeze:
MarkupSafe==1.1.1
-ruamel.yaml.clib==0.1.2
-six==1.12.0
+ruamel.yaml.clib==0.2.0
+six==1.13.0
diff --git a/src/buildstream/testing/_utils/junction.py b/src/buildstream/testing/_utils/junction.py
index cfc5898a9..e4dbd5984 100644
--- a/src/buildstream/testing/_utils/junction.py
+++ b/src/buildstream/testing/_utils/junction.py
@@ -70,4 +70,4 @@ class _SimpleGit(Repo):
kwargs["env"] = dict(GIT_ENV, PWD=self.repo)
kwargs.setdefault("cwd", self.repo)
kwargs.setdefault("check", True)
- return subprocess.run(argv, **kwargs)
+ return subprocess.run(argv, **kwargs) # pylint: disable=subprocess-run-check
diff --git a/tests/testutils/repo/git.py b/tests/testutils/repo/git.py
index b9360e9cd..1deca3ff7 100644
--- a/tests/testutils/repo/git.py
+++ b/tests/testutils/repo/git.py
@@ -27,7 +27,7 @@ class Git(Repo):
kwargs["env"] = dict(self.env, PWD=self.repo)
kwargs.setdefault("cwd", self.repo)
kwargs.setdefault("check", True)
- return subprocess.run(argv, **kwargs)
+ return subprocess.run(argv, **kwargs) # pylint: disable=subprocess-run-check
def create(self, directory):
self.copy_directory(directory, self.repo)