Merge pull request #653 from anikitinDSR/increment-crypto

Increment crypto
hyperledger · Apr 17, 2018 · a7c8a85 · a7c8a85
2 parents 4c45a31 + 78ca198
commit a7c8a85
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/ci/code-validation.dockerfile b/ci/code-validation.dockerfile
@@ -12,7 +12,7 @@ RUN apt-get update -y && apt-get install -y \
 	python-setuptools \
 	python3-nacl
 RUN pip3 install -U \ 
-	pip \ 
+	'pip<10.0.0' \
 	setuptools \
 	pep8 \
 	pep8-naming \

diff --git a/environment/docker/baseimage/indy-baseimage.ubuntu.dockerfile b/environment/docker/baseimage/indy-baseimage.ubuntu.dockerfile
@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y \
 
 # pypi based packages
 RUN pip3 install -U \ 
-    pip \ 
+    'pip<10.0.0' \
     setuptools \
     virtualenv
 

diff --git a/environment/docker/pool/core.ubuntu.dockerfile b/environment/docker/pool/core.ubuntu.dockerfile
@@ -13,7 +13,7 @@ RUN apt-get update -y && apt-get install -y \
 	apt-transport-https \
 	ca-certificates 
 RUN pip3 install -U \ 
-	pip \ 
+	'pip<10.0.0' \
 	setuptools
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BD33704C

diff --git a/environment/openshift/core.ubuntu.dockerfile b/environment/openshift/core.ubuntu.dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update -y && apt-get install -y \
 	ca-certificates
 
 RUN pip3 install -U \ 
-	pip \ 
+	'pip<10.0.0' \
 	setuptools
 
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88
@@ -26,4 +26,4 @@ RUN echo "deb https://repo.evernym.com/deb xenial stable" >> /etc/apt/sources.li
 RUN echo "deb https://repo.sovrin.org/deb xenial stable" >> /etc/apt/sources.list
 
 RUN useradd -ms /bin/bash -l -u $uid -G $gid indy
-RUN apt-get update -y && apt-get install -y indy-node
+RUN apt-get update -y && apt-get install -y indy-node
diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@
 LOG_DIR = os.path.join(BASE_DIR, "log")
 CONFIG_FILE = os.path.join(BASE_DIR, "indy_config.py")
 
-tests_require = ['pytest', 'pytest-xdist', 'python3-indy==1.3.1-dev-454']
+tests_require = ['pytest', 'pytest-xdist', 'python3-indy==1.3.1-dev-469']
 
 setup(
     name='indy-node',
@@ -56,7 +56,7 @@
     data_files=[(
         (BASE_DIR, ['data/nssm_original.exe'])
     )],
-    install_requires=['indy-plenum==1.2.38',
+    install_requires=['indy-plenum==1.2.40',
                       'indy-anoncreds==1.0.11',
                       'python-dateutil',
                       'timeout-decorator'],