diff --git a/apps/cic-cache/requirements.txt b/apps/cic-cache/requirements.txt index 40e9bdeb..f9334a62 100644 --- a/apps/cic-cache/requirements.txt +++ b/apps/cic-cache/requirements.txt @@ -10,6 +10,6 @@ celery==4.4.7 redis==3.5.3 chainsyncer[sql]>=0.0.6a1,<0.1.0 erc20-faucet>=0.2.4a2, <0.3.0 -chainlib-eth>=0.0.7a3,<0.1.0 -chainlib>=0.0.7a3,<0.1.0 +chainlib-eth>=0.0.7a5,<0.1.0 +chainlib>=0.0.7a4,<0.1.0 eth-address-index>=0.1.4a1,<0.2.0 diff --git a/apps/cic-eth/requirements.txt b/apps/cic-eth/requirements.txt index 968deb53..79014b27 100644 --- a/apps/cic-eth/requirements.txt +++ b/apps/cic-eth/requirements.txt @@ -1,3 +1,4 @@ celery==4.4.7 -chainlib-eth>=0.0.7a5,<0.1.0 +#chainlib-eth>=0.0.7a5,<0.1.0 +chainlib-eth==0.0.7a4 semver==2.13.0 diff --git a/apps/cic-eth/scripts/migrate.py b/apps/cic-eth/scripts/migrate.py index d3602989..a316967e 100644 --- a/apps/cic-eth/scripts/migrate.py +++ b/apps/cic-eth/scripts/migrate.py @@ -10,6 +10,7 @@ from alembic.config import Config as AlembicConfig import confini from cic_eth.db import dsn_from_config +import cic_eth.cli logging.basicConfig(level=logging.WARNING) logg = logging.getLogger() @@ -19,25 +20,20 @@ rootdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) dbdir = os.path.join(rootdir, 'cic_eth', 'db') migrationsdir = os.path.join(dbdir, 'migrations') -config_dir = os.path.join('/usr/local/etc/cic-eth') +arg_flags = cic_eth.cli.argflag_std_base -argparser = argparse.ArgumentParser() -argparser.add_argument('-c', type=str, default=config_dir, help='config file') -argparser.add_argument('--env-prefix', default=os.environ.get('CONFINI_ENV_PREFIX'), dest='env_prefix', type=str, help='environment prefix for variables to overwrite configuration') +argparser = cic_eth.cli.ArgumentParser(arg_flags) argparser.add_argument('--migrations-dir', dest='migrations_dir', default=migrationsdir, type=str, help='path to alembic migrations directory') argparser.add_argument('--reset', action='store_true', help='downgrade before upgrading') argparser.add_argument('-f', action='store_true', help='force action') -argparser.add_argument('-v', action='store_true', help='be verbose') -argparser.add_argument('-vv', action='store_true', help='be more verbose') args = argparser.parse_args() -if args.vv: - logging.getLogger().setLevel(logging.DEBUG) -elif args.v: - logging.getLogger().setLevel(logging.INFO) - -config = confini.Config(args.c, args.env_prefix) -config.process() +extra_args = { + 'migrations_dir': None, + 'reset': None, + 'f': '_FORCE_ACTION', + } +config = cic_eth.cli.Config.from_args(args, arg_flags, 0, extra_args=extra_args) config.censor('PASSWORD', 'DATABASE') config.censor('PASSWORD', 'SSL') logg.debug('config:\n{}'.format(config))