diff options
author | Valentin David <valentin.david@codethink.co.uk> | 2019-09-03 10:15:20 +0000 |
---|---|---|
committer | Valentin David <valentin.david@codethink.co.uk> | 2019-09-03 10:15:20 +0000 |
commit | 7d70406302e0f8411a74cde1c63d509dd40961ed (patch) | |
tree | 6979ccd61430817ef55572e567a501482c7f7c42 | |
parent | f8ca130adb632614ebff8453fd91d4c96e87221d (diff) | |
parent | 124a4224d210ee857adcbfa10df26dc31f396661 (diff) | |
download | buildstream-7d70406302e0f8411a74cde1c63d509dd40961ed.tar.gz |
Merge branch 'valentindavid/update-requirements-1.4' into 'bst-1'
Update requirements for 1.4
See merge request BuildStream/buildstream!1578
-rw-r--r-- | buildstream/_loader/loadelement.py | 3 | ||||
-rw-r--r-- | requirements/Makefile | 1 | ||||
-rw-r--r-- | requirements/cov-requirements.txt | 14 | ||||
-rw-r--r-- | requirements/dev-requirements.txt | 27 | ||||
-rw-r--r-- | requirements/plugin-requirements.txt | 4 | ||||
-rw-r--r-- | requirements/requirements.in | 2 | ||||
-rw-r--r-- | requirements/requirements.txt | 17 |
7 files changed, 40 insertions, 28 deletions
diff --git a/buildstream/_loader/loadelement.py b/buildstream/_loader/loadelement.py index 0b38cad65..d90e4fe44 100644 --- a/buildstream/_loader/loadelement.py +++ b/buildstream/_loader/loadelement.py @@ -152,6 +152,7 @@ def _extract_depends_from_node(node, *, key=None): output_deps.append(dependency) # Now delete the field, we dont want it anymore - del node[key] + if key in node: + del node[key] return output_deps diff --git a/requirements/Makefile b/requirements/Makefile index 2c4a9f0a9..664912339 100644 --- a/requirements/Makefile +++ b/requirements/Makefile @@ -16,6 +16,7 @@ all: $(REQUIREMENTS_TXT) %.txt: %.in FORCE $(eval VENVDIR := $(shell mktemp -d $(CURDIR)/.bst-venv.XXXXXX)) $(VENV) $(VENVDIR) + $(VENV_PIP) install wheel $(VENV_PIP) install -r $< $(VENV_PIP) freeze -r $< | grep -v pkg-resources > $@ rm -rf $(VENVDIR) diff --git a/requirements/cov-requirements.txt b/requirements/cov-requirements.txt index bed4ccd87..46c70432d 100644 --- a/requirements/cov-requirements.txt +++ b/requirements/cov-requirements.txt @@ -1,11 +1,15 @@ coverage==4.4 -pytest-cov==2.6.1 +pytest-cov==2.7.1 ## The following requirements were added by pip freeze: atomicwrites==1.3.0 attrs==19.1.0 -more-itertools==6.0.0 -pathlib2==2.3.3 -pluggy==0.9.0 +importlib-metadata==0.20 +more-itertools==7.2.0 +packaging==19.1 +pluggy==0.12.0 py==1.8.0 -pytest==4.3.0 +pyparsing==2.4.2 +pytest==5.1.2 six==1.12.0 +wcwidth==0.1.7 +zipp==0.6.0 diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index 5eea578c5..e6f327284 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -1,26 +1,31 @@ pep8==1.7.1 pylint==2.3.1 -pytest==4.3.0 +pytest==5.1.2 pytest-datafiles==2.0 pytest-env==0.6.2 pytest-pep8==1.0.6 -pytest-pylint==0.14.0 -pytest-xdist==1.26.1 +pytest-pylint==0.14.1 +pytest-xdist==1.29.0 pytest-timeout==1.3.3 ## The following requirements were added by pip freeze: apipkg==1.5 -astroid==2.2.3 +astroid==2.2.5 atomicwrites==1.3.0 attrs==19.1.0 -execnet==1.5.0 -isort==4.3.10 -lazy-object-proxy==1.3.1 +execnet==1.7.1 +importlib-metadata==0.20 +isort==4.3.21 +lazy-object-proxy==1.4.2 mccabe==0.6.1 -more-itertools==6.0.0 -pathlib2==2.3.3 -pluggy==0.9.0 +more-itertools==7.2.0 +packaging==19.1 +pluggy==0.12.0 py==1.8.0 +pyparsing==2.4.2 pytest-cache==1.0 pytest-forked==1.0.2 six==1.12.0 -wrapt==1.11.1 +typed-ast==1.4.0 +wcwidth==0.1.7 +wrapt==1.11.2 +zipp==0.6.0 diff --git a/requirements/plugin-requirements.txt b/requirements/plugin-requirements.txt index 6841612bd..ce225551b 100644 --- a/requirements/plugin-requirements.txt +++ b/requirements/plugin-requirements.txt @@ -1,4 +1,4 @@ arpy==1.1.1 -PyGObject==3.30.4 +PyGObject==3.32.2 ## The following requirements were added by pip freeze: -pycairo==1.18.0 +pycairo==1.18.1 diff --git a/requirements/requirements.in b/requirements/requirements.in index 537031128..1695e4044 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -4,6 +4,6 @@ jinja2 >= 2.10 pluginbase protobuf >= 3.5 psutil -ruamel.yaml < 0.15.52 +ruamel.yaml >= 0.16 setuptools ujson diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 99c8bffbc..711cc1973 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,12 +1,13 @@ Click==7.0 -grpcio==1.18.0 -pluginbase==0.7 -protobuf==3.6.1 -psutil==5.4.8 -ruamel.yaml==0.15.51 -setuptools==40.6.2 +grpcio==1.23.0 +pluginbase==1.0.0 +protobuf==3.9.1 +psutil==5.6.3 +ruamel.yaml==0.16.5 +setuptools==40.8.0 ujson==1.35 ## The following requirements were added by pip freeze: -Jinja2==2.10 -MarkupSafe==1.1.0 +Jinja2==2.10.1 +MarkupSafe==1.1.1 +ruamel.yaml.clib==0.1.2 six==1.12.0 |