Skip to content

Commit

Permalink
Merge pull request #632 from sergey-shilov/fix/increment-sdk
Browse files Browse the repository at this point in the history
Add pip version and bump indy-crypto
  • Loading branch information
ashcherbakov authored Apr 17, 2018
2 parents 909ea6b + e44f7e9 commit 904012a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
3 changes: 1 addition & 2 deletions ci/code-validation.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ RUN apt-get update -y && apt-get install -y \
python3-pip \
python-setuptools \
python3-nacl
RUN pip3 install -U \
pip \
RUN pip3 install -U \
setuptools \
pep8 \
pep8-naming \
Expand Down
4 changes: 2 additions & 2 deletions ci/ubuntu.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ RUN echo "To invalidate cache"

RUN apt-get update -y && apt-get install -y \
python3-nacl \
libindy-crypto=0.2.0 \
libindy=1.3.1~454 \
libindy-crypto=0.4.0 \
libindy=1.3.1~469 \
# rocksdb python wrapper
libbz2-dev \
zlib1g-dev \
Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# Load the metadata using exec() so we don't trigger an import of ioflo.__init__
exec(compile(open(METADATA).read(), METADATA, 'exec'))

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-plenum-dev',
Expand All @@ -54,10 +54,10 @@
'prompt_toolkit==0.57', 'pygments',
'rlp', 'sha3', 'leveldb',
'ioflo==1.5.4', 'semver', 'base58', 'orderedset',
'sortedcontainers==1.5.7', 'psutil', 'pip',
'sortedcontainers==1.5.7', 'psutil', 'pip<10.0.0',
'portalocker==0.5.7', 'pyzmq', 'libnacl==1.6.1',
'six==1.11.0', 'psutil', 'intervaltree',
'msgpack-python==0.4.6', 'indy-crypto==0.2.0',
'msgpack-python==0.4.6', 'indy-crypto==0.4.0',
'python-rocksdb==0.6.9'],
setup_requires=['pytest-runner'],
extras_require={
Expand All @@ -74,4 +74,4 @@
'scripts/udp_sender', 'scripts/udp_receiver', 'scripts/filter_log',
'scripts/log_stats',
'scripts/init_bls_keys']
)
)

0 comments on commit 904012a

Please sign in to comment.