# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1565607241 -7200
# Node ID d9e37f7fd35b1ad99ea6cc1611decde93a821f1c
# Parent  62822054a1e23ab9ad1de8b8aa70f2fe60fdda54
docs: always use dev_requirements.txt together with main version constraints in setup.py

pip isn't good at considering old constraints when installing or updating
packages later. Instead, install everything at once.

Note: pip and setuptools are usually installed automatically and could perhaps
be removed from documentation. But for now, let's keep it.

diff -r 62822054a1e2 -r d9e37f7fd35b Jenkinsfile
--- a/Jenkinsfile	Sun Aug 11 14:14:48 2019 +0200
+++ b/Jenkinsfile	Mon Aug 12 12:54:01 2019 +0200
@@ -44,8 +44,7 @@
     }
     stage('setup') {
         def virtualenvscript = """$activatevirtualenv
-            pip install --upgrade -e .
-            pip install -r dev_requirements.txt
+            pip install --upgrade -e . -r dev_requirements.txt
             python setup.py compile_catalog
             """
         if (isUnix()) {
diff -r 62822054a1e2 -r d9e37f7fd35b docs/contributing.rst
--- a/docs/contributing.rst	Sun Aug 11 14:14:48 2019 +0200
+++ b/docs/contributing.rst	Mon Aug 12 12:54:01 2019 +0200
@@ -35,8 +35,7 @@
         virtualenv ../kallithea-venv
         source ../kallithea-venv/bin/activate
         pip install --upgrade pip setuptools
-        pip install --upgrade -e .
-        pip install --upgrade -r dev_requirements.txt
+        pip install --upgrade -e . -r dev_requirements.txt
         kallithea-cli config-create my.ini
         kallithea-cli db-create -c my.ini --user=user --email=user@example.com --password=password --repos=/tmp
         kallithea-cli front-end-build
diff -r 62822054a1e2 -r d9e37f7fd35b scripts/make-release
--- a/scripts/make-release	Sun Aug 11 14:14:48 2019 +0200
+++ b/scripts/make-release	Mon Aug 12 12:54:01 2019 +0200
@@ -19,8 +19,7 @@
 . "$venv/bin/activate"
 
 echo "Install/verify tools needed for building and uploading stuff"
-pip install --upgrade -e .
-pip install --upgrade -r dev_requirements.txt twine
+pip install --upgrade -e . -r dev_requirements.txt twine
 
 echo "Cleanup and update copyrights ... and clean checkout"
 scripts/run-all-cleanup
diff -r 62822054a1e2 -r d9e37f7fd35b scripts/validate-commits
--- a/scripts/validate-commits	Sun Aug 11 14:14:48 2019 +0200
+++ b/scripts/validate-commits	Mon Aug 12 12:54:01 2019 +0200
@@ -37,9 +37,7 @@
     virtualenv -p "$(command -v python2)" "$venv"
     source "$venv/bin/activate"
     pip install --upgrade pip setuptools
-    pip install -e .
-    pip install -r dev_requirements.txt
-    pip install python-ldap python-pam
+    pip install -e . -r dev_requirements.txt python-ldap python-pam
 
     # run-all-cleanup
     scripts/run-all-cleanup