Compare commits
10 Commits
lash/impro
...
lash/allow
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a5f9eace3f
|
||
|
|
a9f4f1ccda
|
||
|
|
67eb3137cf
|
||
|
|
ae870d175f
|
||
|
|
2b43f8a47d
|
||
|
|
a8291f49ab
|
||
|
|
2e3f8a0bf1 | ||
|
|
407b29cef5
|
||
|
|
75c6609dff
|
||
|
|
6a45d5faa7
|
@@ -1,3 +1,4 @@
|
|||||||
|
cic-base==0.1.3a3+build.984b5cff
|
||||||
alembic==1.4.2
|
alembic==1.4.2
|
||||||
confini~=0.3.6rc3
|
confini~=0.3.6rc3
|
||||||
uwsgi==2.0.19.1
|
uwsgi==2.0.19.1
|
||||||
|
|||||||
@@ -6,4 +6,5 @@ sqlparse==0.4.1
|
|||||||
pytest-celery==0.0.0a1
|
pytest-celery==0.0.0a1
|
||||||
eth_tester==0.5.0b3
|
eth_tester==0.5.0b3
|
||||||
py-evm==0.3.0a20
|
py-evm==0.3.0a20
|
||||||
|
cic_base[full]==0.1.3a3+build.984b5cff
|
||||||
sarafu-faucet~=0.0.4a1
|
sarafu-faucet~=0.0.4a1
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
cic-base==0.1.3a3+build.984b5cff
|
||||||
celery==4.4.7
|
celery==4.4.7
|
||||||
crypto-dev-signer~=0.4.14b6
|
crypto-dev-signer~=0.4.14b6
|
||||||
confini~=0.3.6rc3
|
confini~=0.3.6rc3
|
||||||
|
|||||||
@@ -1,5 +1 @@
|
|||||||
celery==4.4.7
|
cic_base[full_graph]==0.1.3a3+build.984b5cff
|
||||||
confini~=0.3.6rc3
|
|
||||||
semver==2.13.0
|
|
||||||
SQLAlchemy==1.3.20
|
|
||||||
alembic==1.4.2
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
cic_base[full_graph]==0.1.3a3+build.984b5cff
|
||||||
cic-eth~=0.11.1a3
|
cic-eth~=0.11.1a3
|
||||||
cic-notify~=0.4.0a7
|
cic-notify~=0.4.0a7
|
||||||
cic-types~=0.1.0a11
|
cic-types~=0.1.0a11
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
sarafu-faucet==0.0.3a3
|
cic-base[full_graph]==0.1.2b15
|
||||||
sarafu-token==0.0.1a8
|
sarafu-faucet==0.0.3a3
|
||||||
cic-eth==0.11.0b16
|
sarafu-token==0.0.1a8
|
||||||
|
cic-eth==0.11.0b16
|
||||||
|
|||||||
@@ -254,10 +254,6 @@ class Verifier:
|
|||||||
if len(k) > 7 and k[:7] == 'verify_':
|
if len(k) > 7 and k[:7] == 'verify_':
|
||||||
logg.debug('verifier has verify method {}'.format(k))
|
logg.debug('verifier has verify method {}'.format(k))
|
||||||
verifymethods.append(k[7:])
|
verifymethods.append(k[7:])
|
||||||
o = self.faucet_tx_factory.token_amount(self.faucet_address, sender_address=ZERO_ADDRESS)
|
|
||||||
r = self.conn.do(o)
|
|
||||||
self.faucet_amount = self.faucet_tx_factory.parse_token_amount(r)
|
|
||||||
logg.info('faucet amount set to {} at verify initialization time'.format(self.faucet_amount))
|
|
||||||
|
|
||||||
self.state = VerifierState(verifymethods, active_tests=active_tests)
|
self.state = VerifierState(verifymethods, active_tests=active_tests)
|
||||||
|
|
||||||
@@ -288,7 +284,6 @@ class Verifier:
|
|||||||
except ValueError:
|
except ValueError:
|
||||||
actual_balance = int(r)
|
actual_balance = int(r)
|
||||||
balance = int(balance / 1000000) * 1000000
|
balance = int(balance / 1000000) * 1000000
|
||||||
balance += self.faucet_amount
|
|
||||||
logg.debug('balance for {}: {}'.format(address, balance))
|
logg.debug('balance for {}: {}'.format(address, balance))
|
||||||
if balance != actual_balance:
|
if balance != actual_balance:
|
||||||
raise VerifierError((actual_balance, balance), 'balance')
|
raise VerifierError((actual_balance, balance), 'balance')
|
||||||
|
|||||||
@@ -1,33 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
MODULE_ROOT='../..'
|
|
||||||
repos=($MODULE_ROOT/cic-cache $MODULE_ROOT/cic-eth $MODULE_ROOT/cic-ussd $MODULE_ROOT/cic-notify)
|
|
||||||
|
|
||||||
sumd=$(realpath ./local_package_sums)
|
|
||||||
mkdir -vp $sumd
|
|
||||||
|
|
||||||
for r in ${repos[@]}; do
|
|
||||||
b=$(basename $r)
|
|
||||||
pushd $r
|
|
||||||
rm -v dist/*
|
|
||||||
python setup.py sdist
|
|
||||||
f=`ls dist/`
|
|
||||||
cp -v dist/$f $sumd/$b.tar.gz
|
|
||||||
pushd $sumd
|
|
||||||
if [ -f $b.sha256sum ]; then
|
|
||||||
echo "sha256sum -c $b.sha256sum"
|
|
||||||
sha256sum $b.tar.gz
|
|
||||||
cat $b.sha256sum
|
|
||||||
sha256sum -c $b.sha256sum
|
|
||||||
if [ $? -gt 0 ]; then
|
|
||||||
>&2 echo "sum mismatch for $f"
|
|
||||||
sha256sum $b.whl > $b.sha256sum
|
|
||||||
else
|
|
||||||
>&2 echo "sum match (no change) for $f"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
sha256sum $b.tar.gz > $b.sha256sum
|
|
||||||
fi
|
|
||||||
popd
|
|
||||||
popd
|
|
||||||
done
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set +x
|
|
||||||
which pyreq-merge &> /dev/null
|
|
||||||
if [ $? -gt 0 ]; then
|
|
||||||
>&2 echo pyreq-merge missing, please install requirements
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
PIP_INDEX_URL=${PIP_INDEX_URL:-http://localhost/python}
|
|
||||||
in=$(mktemp)
|
|
||||||
out=$(mktemp)
|
|
||||||
>&2 echo using tmp $t
|
|
||||||
cat ../../requirements.txt > $out
|
|
||||||
|
|
||||||
repos=(../../cic-cache ../../cic-eth ../../cic-ussd ../../data-seeding ../../cic-notify ../../contract-migration)
|
|
||||||
|
|
||||||
|
|
||||||
for r in ${repos[@]}; do
|
|
||||||
f="$r/requirements.txt"
|
|
||||||
>&2 echo updating $f
|
|
||||||
pyreq-merge $f $out -vv > $in
|
|
||||||
if [ $? -gt 0 ]; then
|
|
||||||
>&2 echo requirement prepare failed for $f
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
cp $in $out
|
|
||||||
|
|
||||||
f="$r/test_requirements.txt"
|
|
||||||
if [ -f $f ]; then
|
|
||||||
>&2 echo updating $f
|
|
||||||
pyreq-merge $f $out -vv > $in
|
|
||||||
if [ $? -gt 0 ]; then
|
|
||||||
>&2 echo requirement prepare failed for $f
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
cp $in $out
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
cp -v $out compiled_requirements.txt
|
|
||||||
|
|
||||||
outd=$(mktemp -d)
|
|
||||||
for r in ${repos[@]}; do
|
|
||||||
f=$(realpath $r/requirements.txt)
|
|
||||||
b=$(basename $f)
|
|
||||||
b_in=$b.in
|
|
||||||
d=$(basename $r)
|
|
||||||
echo output to $outd/$d/$b_in
|
|
||||||
mkdir -vp $outd/$d
|
|
||||||
echo "-r $f" > $outd/$d/$b_in
|
|
||||||
pyreq-update -v $f compiled_requirements.txt >> $outd/$d/$b_in
|
|
||||||
pip-compile --pre -v --extra-index-url $PIP_INDEX_URL $outd/$d/$b_in -o $outd/$d/$b
|
|
||||||
if [ $? -gt 0 ]; then
|
|
||||||
>&2 echo requirement compile failed for $f
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
set -x
|
|
||||||
@@ -1,2 +1 @@
|
|||||||
requirements-magic~=0.0.3a1
|
requirements-magic~=0.0.2
|
||||||
pip-tools==6.2.0
|
|
||||||
|
|||||||
Reference in New Issue
Block a user