diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-04-22 20:51:50 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-04-22 20:51:50 +0200 |
| commit | 743235f280b675cab39adb15de8bcea215a1c038 (patch) | |
| tree | cc37f26399ea9f9c4e0b502dded08d1ab8d44a97 | |
| parent | 0584ea207d7fbfb15a7e2d8e7953786df84cd177 (diff) | |
Use ujson version asked by OpenStack requirement
It's newer than the former tag selected [1].
[1] https://github.com/openstack/requirements/blob/master/upper-constraints.txt
Change-Id: Ie89136da364d7e972a1d7f49c71bdfbbdd9671d8
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/core/Dockerfile | 1 | ||||
| -rw-r--r-- | upper-constraints.txt | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 2fab3b9bb..db223f3b8 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -14,7 +14,6 @@ RUN apk --no-cache add --update \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ sed -i -E /^tempest==+.*$/d upper-constraints.txt && \ - sed -i -E s/^ujson==+.*$/-e\ git+https:\\/\\/github.com\\/esnme\\/ultrajson@$UJSON_TAG#egg=ujson/ upper-constraints.txt && \ pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt -cupper-constraints.txt \ -e git+https://opendev.org/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \ git init /src/functest && \ diff --git a/upper-constraints.txt b/upper-constraints.txt index e1f170cfd..b5876feb4 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -23,7 +23,6 @@ ruamel.yaml.jinja2==0.2.2 git+https://opendev.org/openstack/rally.git#egg=rally git+https://opendev.org/openstack/rally-openstack.git#egg=rally-openstack git+https://github.com/xrally/xrally-kubernetes.git#egg=xrally-kubernetes -git+https://github.com/esnme/ultrajson@d25e024f481c5571d15f3c0c406a498ca0467cfd#egg=ujson pylint===1.9.5;python_version=='2.7' pylint===2.4.4;python_version=='3.8' flake8===3.7.9 |