Skip to content

Commit f81b5e8

Browse files
ashcherbakovAndrei Goncharov
authored and
Andrei Goncharov
committed
use latest indy-crypto (#397)
- building of python-indy-crypto deb is moved to indy-crypto repo; - increment indy-crypto version - indy-crypto is renamed (python3 prefix is removed)
1 parent 134143b commit f81b5e8

File tree

2 files changed

+1
-36
lines changed

2 files changed

+1
-36
lines changed

build-scripts/ubuntu-1604/build-3rd-parties.sh

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -38,40 +38,6 @@ function build_from_pypi {
3838
rm ${PREREM_TMP}
3939
}
4040

41-
function build_indy_crypto {
42-
PACKAGE_NAME=$1
43-
44-
if [ -z $2 ]; then
45-
PACKAGE_VERSION=""
46-
else
47-
PACKAGE_VERSION="==$2"
48-
fi
49-
POSTINST_TMP=postinst-${PACKAGE_NAME}
50-
PREREM_TMP=prerm-${PACKAGE_NAME}
51-
cp postinst ${POSTINST_TMP}
52-
cp prerm ${PREREM_TMP}
53-
sed -i 's/{package_name}/'${PACKAGE_NAME}'/' ${POSTINST_TMP}
54-
sed -i 's/{package_name}/'${PACKAGE_NAME}'/' ${PREREM_TMP}
55-
56-
fpm --input-type "python" \
57-
--output-type "deb" \
58-
--architecture "amd64" \
59-
--verbose \
60-
--python-bin "/usr/bin/python3" \
61-
--exclude "*.pyc" \
62-
--exclude "*.pyo" \
63-
--maintainer "Hyperledger <[email protected]>" \
64-
--after-install ${POSTINST_TMP} \
65-
--before-remove ${PREREM_TMP} \
66-
--package ${OUTPUT_PATH} \
67-
--depends libindy-crypto \
68-
--name ${PACKAGE_NAME} \
69-
${PACKAGE_NAME}${PACKAGE_VERSION}
70-
71-
rm ${POSTINST_TMP}
72-
rm ${PREREM_TMP}
73-
}
74-
7541
build_from_pypi ioflo 1.5.4
7642
build_from_pypi orderedset 2.0
7743
build_from_pypi base58 0.2.4
@@ -83,4 +49,3 @@ build_from_pypi pyzmq 16.0.2
8349
build_from_pypi intervaltree 2.1.0
8450
build_from_pypi portalocker 0.5.7
8551
build_from_pypi sortedcontainers 1.5.7
86-
build_indy_crypto python3-indy-crypto 0.1.2

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
'ioflo==1.5.4', 'semver', 'base58', 'orderedset',
6565
'sortedcontainers==1.5.7', 'psutil', 'pip',
6666
'portalocker==0.5.7', 'pyzmq', 'raet',
67-
'psutil', 'intervaltree', 'msgpack-python==0.4.6', 'python3-indy-crypto==0.1.2'],
67+
'psutil', 'intervaltree', 'msgpack-python==0.4.6', 'indy-crypto==0.1.6'],
6868
extras_require={
6969
'stats': ['python-firebase'],
7070
'benchmark': ['pympler']

0 commit comments

Comments
 (0)