Merge "origin/master" into "lash/improve-cache"

apps/cic-cache/docker/run_tests.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-pip install --extra-index-url https://pip.grassrootseconomics.net:8433 \
+pip install --extra-index-url https://pip.grassrootseconomics.net \
 --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple \
 -r test_requirements.txt 
 

apps/cic-cache/setup.py

@@ -1,18 +1,19 @@
 from setuptools import setup
 
-#import configparser
+# import configparser
 import os
-#import time
 
-#from cic_cache.version import (
+# import time
+
+# from cic_cache.version import (
 #        version_object,
 #        version_string
 #        )
 #
-#class PleaseCommitFirstError(Exception):
+# class PleaseCommitFirstError(Exception):
 #    pass
 #
-#def git_hash():
+# def git_hash():
 #    import subprocess
 #    git_diff = subprocess.run(['git', 'diff'], capture_output=True)
 #    if len(git_diff.stdout) > 0:
@@ -21,18 +22,18 @@ import os
 #    git_hash_brief = git_hash.stdout.decode('utf-8')[:8]
 #    return git_hash_brief
 #
-#version_string = str(version_object)
+# version_string = str(version_object)
 #
-#try:
+# try:
 #    version_git = git_hash()
 #    version_string += '+build.{}'.format(version_git)
-#except FileNotFoundError:
+# except FileNotFoundError:
 #    time_string_pair = str(time.time()).split('.')
 #    version_string += '+build.{}{:<09d}'.format(
 #            time_string_pair[0],
 #            int(time_string_pair[1]),
 #            )
-#print('final version string will be {}'.format(version_string))
+# print('final version string will be {}'.format(version_string))
 
 requirements = []
 f = open('requirements.txt', 'r')
@@ -52,9 +53,8 @@ while True:
     test_requirements.append(l.rstrip())
 f.close()
 
-
 setup(
-#    version=version_string,
+    #    version=version_string,
     install_requires=requirements,
     tests_require=test_requirements,
         )