kamikazechaser/cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WIP move to whole patch versions in deps

Browse Source
This commit is contained in:
nolash 2021-11-15 14:07:48 +01:00
parent 4658a5d8e5
commit 97e45c87d7
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
12 changed files with 51 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/cic-cache/MANIFEST.in
View File

@ -1 +1 @@
include *requirements.txt cic_cache/data/config/*
include *requirements.txt cic_cache/data/config/* cic_cache/db/migrations/default/* cic_cache/db/migrations/default/versions/*

2
apps/cic-cache/docker/db.sh
View File

@ -2,5 +2,5 @@
set -e
>&2 echo executing database migration
python scripts/migrate.py --migrations-dir /usr/local/share/cic-cache/alembic -vv
python scripts/migrate_cic_cache.py --migrations-dir /usr/local/share/cic-cache/alembic -vv
set +e

2
apps/cic-cache/scripts/migrate.py → apps/cic-cache/scripts/migrate_cic_cache.py
View File

@ -19,7 +19,7 @@ logging.basicConfig(level=logging.WARNING)
logg = logging.getLogger()
# BUG: the dbdir doesn't work after script install
rootdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
rootdir = os.path.dirname(os.path.dirname(os.path.realpath(cic_cache.__file__)))
dbdir = os.path.join(rootdir, 'cic_cache', 'db')
default_migrations_dir = os.path.join(dbdir, 'migrations')
configdir = os.path.join(rootdir, 'cic_cache', 'data', 'config')

4
apps/cic-cache/setup.cfg
View File

@ -1,7 +1,7 @@
[metadata]
name = cic-cache
description = CIC Cache API and server
version = 0.2.1a11
version = 0.3.0a1
author = Louis Holbrook
author_email = dev@holbrook.no
url = https://gitlab.com/grassrootseconomics/cic-eth
@ -35,7 +35,7 @@ packages =
cic_cache.runnable.daemons
cic_cache.runnable.daemons.filters
scripts =
./scripts/migrate.py
./scripts/migrate_cic_cache.py
[options.entry_points]
console_scripts =

8
apps/cic-eth/admin_requirements.txt
View File

@ -1,5 +1,5 @@
SQLAlchemy==1.3.20
cic-eth-registry>=0.6.1a6,<0.7.0
hexathon~=0.0.1a8
chainqueue>=0.0.4a6,<0.1.0
eth-erc20>=0.1.2a2,<0.2.0
cic-eth-registry~=0.6.2a1
hexathon~=0.1.0
chainqueue~=0.0.6a3
eth-erc20~=0.1.2

4
apps/cic-eth/requirements.txt
View File

@ -1,4 +1,4 @@
celery==4.4.7
chainlib-eth>=0.0.10a20,<0.1.0
chainlib-eth~=0.0.12
semver==2.13.0
urlybird~=0.0.1a2
urlybird~=0.0.1

24
apps/cic-eth/services_requirements.txt
View File

@ -1,16 +1,16 @@
chainqueue>=0.0.6a1,<0.1.0
chainsyncer[sql]>=0.0.7a3,<0.1.0
chainqueue~=0.0.6a3
chainsyncer[sql]~=0.0.7
alembic==1.4.2
confini>=0.3.6rc4,<0.5.0
confini~=0.5.1
redis==3.5.3
hexathon~=0.0.1a8
hexathon~=0.1.0
pycryptodome==3.10.1
liveness~=0.0.1a7
eth-address-index>=0.2.4a1,<0.3.0
eth-accounts-index>=0.1.2a3,<0.2.0
cic-eth-registry>=0.6.1a6,<0.7.0
erc20-faucet>=0.3.2a2,<0.4.0
erc20-transfer-authorization>=0.3.5a2,<0.4.0
sarafu-faucet>=0.0.7a2,<0.1.0
moolb~=0.1.1b2
okota>=0.2.4a6,<0.3.0
eth-address-index~=0.2.4
eth-accounts-index~=0.1.2
cic-eth-registry~=0.6.2a1
erc20-faucet~=0.3.2
#erc20-transfer-authorization~=0.3.5
sarafu-faucet~=0.0.7
moolb~=0.2.0
okota~=0.2.5a1

2
apps/cic-eth/setup.cfg
View File

@ -1,7 +1,7 @@
[metadata]
name = cic-eth
#version = attr: cic_eth.version.__version_string__
version = 0.12.5a2
version = 0.12.5a10
description = CIC Network Ethereum interaction
author = Louis Holbrook
author_email = dev@holbrook.no

3
apps/cic-eth/test_requirements.txt
View File

@ -6,4 +6,5 @@ pytest-redis==2.0.0
redis==3.5.3
eth-tester==0.5.0b3
py-evm==0.3.0a20
eth-erc20~=0.1.2a2
eth-erc20~=0.1.2
erc20-transfer-authorization~=0.3.5

7
apps/cic-eth/tools_requirements.txt
View File

@ -1,7 +1,6 @@
crypto-dev-signer>=0.4.15rc2,<=0.4.15
chainqueue>=0.0.5a3,<0.1.0
cic-eth-registry>=0.6.1a6,<0.7.0
chainqueue~=0.0.6a3
cic-eth-registry~=0.6.2a1
redis==3.5.3
hexathon~=0.0.1a8
hexathon~=0.1.0
pycryptodome==3.10.1
pyxdg==0.27

22
apps/contract-migration/2_deploy_contract_instance.sh
View File

@ -41,17 +41,17 @@ add_pending_tx_hash $r
# Deploy transfer authorization contact
advance_nonce
debug_rpc
>&2 echo -e "\033[;96mDeploy transfer authorization contract\033[;39m"
DEV_TRANSFER_AUTHORIZATION_ADDRESS=`erc20-transfer-auth-deploy --nonce $nonce -w $gas_price_arg -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG`
>&2 echo -e "\033[;96mAdd transfer authorization record to contract registry\033[;39m"
advance_nonce
debug_rpc
r=`eth-contract-registry-set $DEV_WAIT_FLAG $fee_price_arg --nonce $nonce -s -u -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier TransferAuthorization $DEV_TRANSFER_AUTHORIZATION_ADDRESS`
add_pending_tx_hash $r
#advance_nonce
#debug_rpc
#>&2 echo -e "\033[;96mDeploy transfer authorization contract\033[;39m"
#DEV_TRANSFER_AUTHORIZATION_ADDRESS=`erc20-transfer-auth-deploy --nonce $nonce -w $gas_price_arg -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG`
#
#
#>&2 echo -e "\033[;96mAdd transfer authorization record to contract registry\033[;39m"
#advance_nonce
#debug_rpc
#r=`eth-contract-registry-set $DEV_WAIT_FLAG $fee_price_arg --nonce $nonce -s -u -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier TransferAuthorization $DEV_TRANSFER_AUTHORIZATION_ADDRESS`
#add_pending_tx_hash $r
# Deploy token index contract

23
apps/contract-migration/requirements.txt
View File

@ -1,12 +1,11 @@
cic-eth[tools]==0.12.5a2
chainlib-eth>=0.0.10a17,<0.1.0
eth-erc20>=0.1.2a3,<0.2.0
erc20-demurrage-token>=0.0.5a2,<0.1.0
eth-address-index>=0.2.4a1,<0.3.0
cic-eth-registry>=0.6.1a6,<0.7.0
erc20-transfer-authorization>=0.3.5a2,<0.4.0
erc20-faucet>=0.3.2a2,<0.4.0
sarafu-faucet>=0.0.7a2,<0.1.0
confini>=0.4.2rc3,<1.0.0
eth-token-index>=0.2.4a1,<=0.3.0
okota>=0.2.4a15,<0.3.0
cic-eth[tools]==0.12.5a10
chainlib-eth==0.0.12
eth-erc20==0.1.2
erc20-demurrage-token==0.0.5a4
eth-address-index==0.2.4
cic-eth-registry==0.6.2a1
erc20-faucet==0.3.2
sarafu-faucet==0.0.7
confini~=0.5.1
eth-token-index==0.2.4
okota==0.2.5a1