From 497410340f2e2094de4dac4f5e0e8f0ffa39f31d Mon Sep 17 00:00:00 2001 From: tim Date: Fri, 26 Jul 2024 23:34:09 -0400 Subject: [PATCH] updated requirements --- bin/config-push | 15 +++++++++------ bin/secret-push | 13 ++++++++----- requirements-lock.txt | 4 ++-- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/bin/config-push b/bin/config-push index 8850519..82314bf 100755 --- a/bin/config-push +++ b/bin/config-push @@ -1,5 +1,8 @@ #!/bin/bash +SCRIPT_DIR="$(dirname -- "$( readlink -f -- "$0"; )";)" +CONF_DIR="$SCRIPT_DIR/../conf" + if [ "$1" == "" ]; then echo 'usage: config-push {config_name} [secret_name]' exit 1 @@ -14,9 +17,9 @@ else KEY=backend fi -DEXO="conf/dexorder-$CONFIG.toml" +DEXO="$CONF_DIR/dexorder-$CONFIG.toml" if [ ! -f "$DEXO" ]; then - DEXO="conf/$CONFIG/dexorder-$CONFIG.toml" + DEXO="$CONF_DIR/$CONFIG/dexorder-$CONFIG.toml" fi if [ ! -f "$DEXO" ]; then DEXO= @@ -24,9 +27,9 @@ else DEXO="--from-file dexorder.toml=$DEXO" fi -LOG="conf/logging-$CONFIG.toml" +LOG="$CONF_DIR/logging-$CONFIG.toml" if [ ! -f "$LOG" ]; then - LOG="conf/$CONFIG/logging-$CONFIG.toml" + LOG="$CONF_DIR/$CONFIG/logging-$CONFIG.toml" fi if [ ! -f "$LOG" ]; then LOG= @@ -34,9 +37,9 @@ else LOG="--from-file logging.toml=$LOG" fi -META="conf/metadata-$CONFIG.json" +META="$CONF_DIR/metadata-$CONFIG.json" if [ ! -f "$META" ]; then - META="conf/$CONFIG/metadata-$CONFIG.json" + META="$CONF_DIR/$CONFIG/metadata-$CONFIG.json" fi if [ ! -f "$META" ]; then META= diff --git a/bin/secret-push b/bin/secret-push index 18f3a30..6a2a71e 100755 --- a/bin/secret-push +++ b/bin/secret-push @@ -1,5 +1,8 @@ #!/bin/bash +SCRIPT_DIR="$(dirname -- "$( readlink -f -- "$0"; )";)" +CONF_DIR="$SCRIPT_DIR/../conf" + if [ "$1" == "" ]; then echo 'usage: secret-push {config_name} [secret_name]' exit 1 @@ -9,18 +12,18 @@ CONFIG=$1 shift if [ "$1" != "" ]; then - KEY=backend-$1 + KEY=backend-secret-$1 else - KEY=backend + KEY=backend-secret fi -FILE="conf/dexorder-$CONFIG.toml" +FILE="$CONF_DIR/dexorder-$CONFIG.toml" if [ ! -f "$FILE" ]; then - FILE="conf/$CONFIG/dexorder-$CONFIG.toml" + FILE="$CONF_DIR/$CONFIG/dexorder-$CONFIG.toml" fi if [ ! -f "$FILE" ]; then - echo Could not find config file for $1 + echo Could not find config file for $CONFIG exit 1; fi diff --git a/requirements-lock.txt b/requirements-lock.txt index 24e2d4a..fdf08c5 100644 --- a/requirements-lock.txt +++ b/requirements-lock.txt @@ -5,7 +5,7 @@ antlr4-python3-runtime==4.9.3 async-lru==2.0.4 attrs==23.2.0 bitarray==2.9.2 -cachetools==5.3.3 +cachetools==5.4.0 certifi==2024.2.2 charset-normalizer==3.3.2 ckzg==1.0.1 @@ -54,6 +54,6 @@ SQLAlchemy==2.0.31 toolz==0.12.1 typing_extensions==4.11.0 urllib3==2.2.1 -web3==6.20.0 +web3==6.20.1 websockets==12.0 yarl==1.9.4