Bump deps

Complete rehabilitation for tests in isolated categories
Fix admin lock test, add delete init locks in db fixture
2021-04-25 16:50:46 +02:00 · 2021-04-25 16:28:59 +02:00 · 2021-04-25 15:55:34 +02:00 · 2021-04-25 15:48:13 +02:00 · 2021-04-25 15:08:39 +02:00 · 2021-04-25 14:28:31 +02:00
1 changed files with 5 additions and 4 deletions
@@ -13,10 +13,11 @@ DEV_PIP_EXTRA_INDEX_URL=${DEV_PIP_EXTRA_INDEX_URL:-https://pip.grassrootseconomi
 DEV_DATABASE_NAME_CIC_ETH=${DEV_DATABASE_NAME_CIC_ETH:-"cic-eth"}
 CIC_DATA_DIR=${CIC_DATA_DIR:-/tmp/cic} 
 ETH_PASSPHRASE=''
-CIC_DEFAULT_TOKEN_SYMBOL=${CIC_DEFAULT_TOKEN_SYMBOL:-GFT}
-if [[ $CIC_DEFAULT_TOKEN_SYMBOL != 'GFT' && $CIC_DEFAULT_TOKEN_SYMBOL != 'SRF' ]]; then
-	>&2 echo CIC_DEFAULT_TOKEN_SYMBOL must be one of [GFT,SRF], but was $CIC_DEFAULT_TOKEN_SYMBOL
-	exit 1
+DEV_TOKEN_TYPE=${DEV_TOKEN_TYPE:-giftable}
+if [ $DEV_TOKEN_TYPE = 'giftable' ]; then
+	token_symbol='GFT'
+else
+	token_symbol='SRF'
 fi

 # Debug flag
Author	SHA1	Message	Date
nolash	1752de6022	Bump deps	2021-04-25 16:50:46 +02:00
nolash	fcfc158e62	Complete rehabilitation for tests in isolated categories	2021-04-25 16:28:59 +02:00
nolash	01513fa9ad	Fix admin lock test, add delete init locks in db fixture	2021-04-25 15:55:34 +02:00
nolash	10153516f0	Rehabilitate filter tests	2021-04-25 15:48:13 +02:00
nolash	3eaf79d3fa	Update requirements for new rpc constructors in pytest	2021-04-25 15:08:39 +02:00
nolash	d21202b65d	Merge remote-tracking branch 'origin/master' into lash/rehabilitate-tests	2021-04-25 14:28:31 +02:00
nolash	8a92814c59	Make all celery fixtures session workers	2021-04-24 10:55:16 +02:00