Remove foreign changes

Merge remote-tracking branch 'origin/master' into lash/version-conflict
Merge branch 'lash/fix-chainlib-upgrade' into 'master'
2021-04-25 14:14:05 +02:00 · 2021-04-25 14:12:00 +02:00 · 2021-04-25 12:08:40 +00:00 · 2021-04-25 12:08:40 +00:00 · 2021-04-25 11:49:31 +02:00 · 2021-04-25 11:45:32 +02:00
4 changed files with 8 additions and 8 deletions
--- a/apps/cic-eth/cic_eth/version.py
+++ b/apps/cic-eth/cic_eth/version.py
@@ -10,7 +10,7 @@ version = (
        0,
        11,
        0,
-        'beta.8',
+        'beta.10',
        )

 version_object = semver.VersionInfo(
--- a/apps/cic-eth/requirements.txt
+++ b/apps/cic-eth/requirements.txt
@@ -1,4 +1,4 @@
-cic-base==0.1.2b2
+cic-base==0.1.2b3
 celery==4.4.7
 crypto-dev-signer~=0.4.14b3
 confini~=0.3.6rc3
@@ -15,7 +15,7 @@ semver==2.13.0
 websocket-client==0.57.0
 moolb~=0.1.1b2
 eth-address-index~=0.1.1a9
-chainlib~=0.0.2a13
+chainlib~=0.0.2a18
 hexathon~=0.0.1a7
 chainsyncer[sql]~=0.0.2a2
 chainqueue~=0.0.1a7
--- a/apps/cic-ussd/requirements.txt
+++ b/apps/cic-ussd/requirements.txt
@@ -1,4 +1,4 @@
-cic_base[full_graph]~=0.1.2a79
-cic-eth~=0.11.0b7
+cic_base[full_graph]~=0.1.2b2
+cic-eth~=0.11.0b9
 cic-notify~=0.4.0a4
 cic-types~=0.1.0a10
--- a/apps/contract-migration/scripts/requirements.txt
+++ b/apps/contract-migration/scripts/requirements.txt
@@ -1,5 +1,5 @@
-cic-base[full_graph]==0.1.2a77
+cic-base[full_graph]==0.1.2b2
 sarafu-faucet==0.0.2a28
-cic-eth==0.11.0b6
+cic-eth==0.11.0b10
 cic-types==0.1.0a10
-crypto-dev-signer==0.4.14b2
+crypto-dev-signer==0.4.14b3
Author	SHA1	Message	Date
nolash	f4bbd22f54	Remove foreign changes	2021-04-25 14:14:05 +02:00
nolash	b99b5bd4fa	Merge remote-tracking branch 'origin/master' into lash/version-conflict	2021-04-25 14:12:00 +02:00
Louis Holbrook	7504a899a1	Merge branch 'lash/fix-chainlib-upgrade' into 'master' Upgrade chainlib See merge request grassrootseconomics/cic-internal-integration!119	2021-04-25 12:08:40 +00:00
Louis Holbrook	c20c5af27c	Upgrade chainlib	2021-04-25 12:08:40 +00:00
nolash	8f33ce40e1	Final attempt before deferring to devops	2021-04-25 11:49:31 +02:00
nolash	3a63d0505f	Another attempt at running ci for scripts	2021-04-25 11:45:32 +02:00
nolash	334c63b1e6	Poking script setup as it doesnt work like it did before	2021-04-25 11:39:40 +02:00
nolash	b123e050c3	Add script invocation	2021-04-25 11:37:58 +02:00
nolash	e27d5d8b33	scripts ci typo	2021-04-25 11:33:23 +02:00
nolash	cc35c498c8	Attempt add script ci	2021-04-25 11:32:20 +02:00
nolash	dea7bc8a1c	Fix cic-ussd cic-eth conflict	2021-04-25 10:52:39 +02:00
Louis Holbrook	32b72274f5	Merge branch 'lash/emergency-shutdown-II' into 'master' Add remaining health checks and shutdown on critical errors See merge request grassrootseconomics/cic-internal-integration!115	2021-04-24 17:53:45 +00:00
Louis Holbrook	f50da54274	Add remaining health checks and shutdown on critical errors	2021-04-24 17:53:45 +00:00
Louis Holbrook	dd94b8a190	Merge branch 'lash/default-token' into 'master' cic-eth: Add default token setting to cic-eth with api See merge request grassrootseconomics/cic-internal-integration!113	2021-04-24 17:49:21 +00:00
Louis Holbrook	16dd210965	cic-eth: Add default token setting to cic-eth with api	2021-04-24 17:49:21 +00:00