Merge branch 'DEV_0.6.3' into 420_sort_relations_alfa

* DEV_0.6.3: Update pyup config. Always update setuptools.
OnroerendErfgoed · Dec 14, 2017 · 7ec0f68 · 7ec0f68
2 parents 9220563 + 1e48d58
commit 7ec0f68
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/.pyup.yml b/.pyup.yml
@@ -2,3 +2,10 @@
 # see https://pyup.io/docs/configuration/ for all available options
 
 schedule: every week
+
+# Focus on production requirements, not development
+requirements:
+    - requirements.txt:
+        update: all
+    - requirements-dev.txt:
+        update: insecure
diff --git a/tox.ini b/tox.ini
@@ -8,6 +8,7 @@ deps =
         mock
 		testfixtures
 commands =
+        pip install -U setuptools
         pip install -r requirements-dev.txt
 		py.test tests
 
@@ -21,5 +22,6 @@ deps =
 		mock
 		testfixtures
 commands =
+        pip install -U setuptools
         pip install -r requirements-dev.txt
 		py.test --cov atramhasis --cov-report term-missing tests