[KMS-ETH]- Merge remote-tracking branch 'remotes/origin/master' into lib

nkms_eth/blockchain.py

@@ -19,7 +19,7 @@ def project():
     # It will read user-specific configs also which may override it
     if not hasattr(_project, 'project'):
         project_dir = join(dirname(abspath(nkms_eth.__file__)), 'project')
-        project = populus.Project(project_dir, create_config_file=False)
+        project = populus.Project(project_dir)
         project.config['chains.mainnetrpc']['contracts']['backends']['JSONFile']['settings']['file_path'] = REGISTRAR_PATH
         _project.project = project
     return _project.project

setup.py

@@ -4,7 +4,8 @@ version = '0.1'
 
 INSTALL_REQUIRES = [
         'appdirs',
-        'populus'
+        'populus',
+        'cytoolz==0.8.2'  # XXX temporary!
 ]
 
 TESTS_REQUIRE = [

setup.sh

@@ -3,6 +3,6 @@
 virtualenv -p python3 .venv
 source .venv/bin/activate
 pip3 install -r requirements.txt
-wget https://github.com/ethereum/solidity/releases/download/v0.4.18/solc-static-linux -O .venv/bin/solc
+wget https://github.com/ethereum/solidity/releases/download/v0.4.19/solc-static-linux -O .venv/bin/solc
 chmod +x .venv/bin/solc
 pip3 install -e .