Finish update

.circleci/config.yml

@@ -5,7 +5,7 @@ machine:
 jobs:
   django testing:
     docker:
-      - image: maxboh/docker-circleci-node-miniconda-gdal:graph_tool
+      - image: maxboh/docker-circleci-node-miniconda-gdal:graph_tool_stretch
     steps:
       - checkout
       - run: mkdir test-reports
@@ -31,7 +31,7 @@ jobs:
 
   selenium testing:
     docker:
-      - image: maxboh/docker-circleci-node-miniconda-gdal:graph_tool
+      - image: maxboh/docker-circleci-node-miniconda-gdal:graph_tool_stretch
     steps:
       - checkout
       - run:
@@ -74,7 +74,7 @@ jobs:
 
   setup database:
     docker:
-      - image: maxboh/docker-circleci-node-miniconda-gdal:graph_tool
+      - image: maxboh/docker-circleci-node-miniconda-gdal:graph_tool_stretch
     steps:
       - checkout
       - run:
@@ -93,7 +93,7 @@ jobs:
 
   jasmine tests:
     docker:
-      - image: maxboh/docker-circleci-node-miniconda-gdal:graph_tool
+      - image: maxboh/docker-circleci-node-miniconda-gdal:graph_tool_stretch
     steps:
       - checkout
       - run: mkdir test-reports

.gitignore

@@ -21,3 +21,4 @@ ssh_pg_h2020.sh
 /package-lock.json
 /0.2.1&subdirectory
 /2.4.1
+.pytest_cache

Dockerfile

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM circleci/python:3.6-stretch-node-browsers
+=======
+FROM maxboh/docker-circleci-node-miniconda-gdal:graph_tool_stretch
+>>>>>>> master-upstream
 
 ENV CIRCLECIPATH $PATH
 

VagrantProvisionUbuntu1804.sh

@@ -24,8 +24,8 @@ echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/source
 sudo apt-get update && sudo apt-get install -y --allow-unauthenticated yarn
 
 echo "Installing graph-tools..."
-sudo add-apt-repository -y "deb http://downloads.skewed.de/apt/bionic bionic universe"
 sudo apt-key adv --keyserver pgp.skewed.de --recv-key 612DEFB798507F25
+sudo add-apt-repository -y "deb http://downloads.skewed.de/apt/bionic bionic universe"
 sudo apt-get update && sudo apt-get install -y --allow-unauthenticated python3-graph-tool
 
 sudo apt-get install -y libcairo2-dev libjpeg-dev libgif-dev

repair/.gitignore

@@ -4,3 +4,4 @@ static/bundles
 *.json
 !static/data/*.json
 /settings_dev_local_pg.py
+/settings_tests_local_pg.py

repair/apps/asmfa/factories.py

@@ -63,8 +63,8 @@ class Meta:
 class ActivityFactory(NodeFactory):
     class Meta:
         model = models.Activity
-    name = factory.Sequence(lambda n: "Activity #%s" % n)
-    nace = '52.Retail'
+    name = factory.Sequence(lambda n: f'Activity #{n}')
+    nace = factory.Sequence(lambda n: f'E-{n}')
     activitygroup = factory.SubFactory(ActivityGroupFactory)
 
 
@@ -210,10 +210,11 @@ class Meta:
 class FractionFlowFactory(FlowFactory):
     class Meta:
         model = models.FractionFlow
+    flow = factory.SubFactory(Actor2ActorFactory)
+    stock = factory.SubFactory(ActorStockFactory)
     origin = factory.SubFactory(ActorFactory)
     destination = factory.SubFactory(ActorFactory)
     material = factory.SubFactory(MaterialFactory)
     composition_name = factory.Sequence(lambda n: "Composition #%s" % n)
     nace = '52.Retail'
     amount = 0.0
-