From 97e45c87d76f5575a3751e32efa0f21e6dcbcce5 Mon Sep 17 00:00:00 2001 From: nolash Date: Mon, 15 Nov 2021 14:07:48 +0100 Subject: [PATCH] WIP move to whole patch versions in deps --- apps/cic-cache/MANIFEST.in | 2 +- apps/cic-cache/docker/db.sh | 2 +- .../{migrate.py => migrate_cic_cache.py} | 2 +- apps/cic-cache/setup.cfg | 4 ++-- apps/cic-eth/admin_requirements.txt | 8 +++---- apps/cic-eth/requirements.txt | 4 ++-- apps/cic-eth/services_requirements.txt | 24 +++++++++---------- apps/cic-eth/setup.cfg | 2 +- apps/cic-eth/test_requirements.txt | 3 ++- apps/cic-eth/tools_requirements.txt | 7 +++--- .../2_deploy_contract_instance.sh | 22 ++++++++--------- apps/contract-migration/requirements.txt | 23 +++++++++--------- 12 files changed, 51 insertions(+), 52 deletions(-) rename apps/cic-cache/scripts/{migrate.py => migrate_cic_cache.py} (96%) diff --git a/apps/cic-cache/MANIFEST.in b/apps/cic-cache/MANIFEST.in index 2630c39c..e05afcd9 100644 --- a/apps/cic-cache/MANIFEST.in +++ b/apps/cic-cache/MANIFEST.in @@ -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/* diff --git a/apps/cic-cache/docker/db.sh b/apps/cic-cache/docker/db.sh index 1b389456..a5aac6f0 100644 --- a/apps/cic-cache/docker/db.sh +++ b/apps/cic-cache/docker/db.sh @@ -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 diff --git a/apps/cic-cache/scripts/migrate.py b/apps/cic-cache/scripts/migrate_cic_cache.py similarity index 96% rename from apps/cic-cache/scripts/migrate.py rename to apps/cic-cache/scripts/migrate_cic_cache.py index 5adc3968..9b9296c2 100644 --- a/apps/cic-cache/scripts/migrate.py +++ b/apps/cic-cache/scripts/migrate_cic_cache.py @@ -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') diff --git a/apps/cic-cache/setup.cfg b/apps/cic-cache/setup.cfg index 345b5746..1cd1eb52 100644 --- a/apps/cic-cache/setup.cfg +++ b/apps/cic-cache/setup.cfg @@ -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 = diff --git a/apps/cic-eth/admin_requirements.txt b/apps/cic-eth/admin_requirements.txt index cd9fcc74..ff0cc099 100644 --- a/apps/cic-eth/admin_requirements.txt +++ b/apps/cic-eth/admin_requirements.txt @@ -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 diff --git a/apps/cic-eth/requirements.txt b/apps/cic-eth/requirements.txt index b1097b28..94c1789a 100644 --- a/apps/cic-eth/requirements.txt +++ b/apps/cic-eth/requirements.txt @@ -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 diff --git a/apps/cic-eth/services_requirements.txt b/apps/cic-eth/services_requirements.txt index d8737146..b27b66b6 100644 --- a/apps/cic-eth/services_requirements.txt +++ b/apps/cic-eth/services_requirements.txt @@ -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 diff --git a/apps/cic-eth/setup.cfg b/apps/cic-eth/setup.cfg index de73a581..7b33c950 100644 --- a/apps/cic-eth/setup.cfg +++ b/apps/cic-eth/setup.cfg @@ -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 diff --git a/apps/cic-eth/test_requirements.txt b/apps/cic-eth/test_requirements.txt index 67462190..a213de5a 100644 --- a/apps/cic-eth/test_requirements.txt +++ b/apps/cic-eth/test_requirements.txt @@ -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 diff --git a/apps/cic-eth/tools_requirements.txt b/apps/cic-eth/tools_requirements.txt index 77eece3f..c4e714c5 100644 --- a/apps/cic-eth/tools_requirements.txt +++ b/apps/cic-eth/tools_requirements.txt @@ -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 diff --git a/apps/contract-migration/2_deploy_contract_instance.sh b/apps/contract-migration/2_deploy_contract_instance.sh index ed8a24dc..5dc0fa73 100644 --- a/apps/contract-migration/2_deploy_contract_instance.sh +++ b/apps/contract-migration/2_deploy_contract_instance.sh @@ -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 diff --git a/apps/contract-migration/requirements.txt b/apps/contract-migration/requirements.txt index e365c10e..b155558e 100644 --- a/apps/contract-migration/requirements.txt +++ b/apps/contract-migration/requirements.txt @@ -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