Merge pull request #242 from plone/py3

Use python 3

docs/source/setup.rst

@@ -16,23 +16,23 @@ Checkout this repository:
 
 .. code-block:: shell
 
-    $ git clone git@github.com:plone/jenkins.plone.org.git
-    $ cd jenkins.plone.org
+    git clone git@github.com:plone/jenkins.plone.org.git
+    cd jenkins.plone.org
 
 Create and activate a virtualenv:
 
 .. code-block:: shell
 
-    $ virtualenv -p python2.7 .
-    $ source ./bin/activate
+    python3.6 -m venv .
+    ./bin/activate
 
 Install all the tools needed (ansible, ansible roles and jenkins-job-builder):
 
 .. code-block:: shell
 
-    $ pip install -r requirements.txt
-    $ ansible-galaxy install -r ansible/roles.yml
-    $ git submodule update --init
+    pip install -r requirements.txt
+    ansible-galaxy install -r ansible/roles.yml
+    git submodule update --init
 
 .. note::
    For the roles that are downloaded from checkouts,
@@ -41,31 +41,31 @@ Install all the tools needed (ansible, ansible roles and jenkins-job-builder):
 
    .. code-block:: shell
 
-       $ cd ansible/roles
-       $ rm -rf plone.jenkins_server
-       $ rm -rf plone.jenkins_node
-       $ git clone git@github.com:plone/plone.jenkins_server
-       $ git clone git@github.com:plone/plone.jenkins_node
+       cd ansible/roles
+       rm -rf plone.jenkins_server
+       rm -rf plone.jenkins_node
+       git clone git@github.com:plone/plone.jenkins_server
+       git clone git@github.com:plone/plone.jenkins_node
 
 Check ansible/inventory.txt and make sure that you can connect to the machines listed there.
 
 Copy your public ssh key to all servers:
 
 .. code-block:: shell
 
-    $ ssh-copy-id -i ~/.ssh/<SSH-KEY>.pub root@<SERVER_IP>
+    ssh-copy-id -i ~/.ssh/<SSH-KEY>.pub root@<SERVER_IP>
 
 Set Up Jenkins Server
 ---------------------
 .. code-block:: shell
 
-    $ ./update_master.sh
+    ./update_master.sh
 
 Set Up Jenkins Nodes
 --------------------
 .. code-block:: shell
 
-    $ ./update_nodes.sh
+    ./update_nodes.sh
 
 Set Up Jenkins Jobs
 -------------------
@@ -76,15 +76,15 @@ Put jenkins-job-builder in development mode:
 
 .. code-block:: shell
 
-    $ cd src/jenkins-job-builder
-    $ pip install -r requirements.txt
-    $ python setup.py develop
+    cd src/jenkins-job-builder
+    pip install -r requirements.txt -c ../../requirements.txt
+    python setup.py develop
 
 Test the jobs are properly setup:
 
 .. code-block:: shell
 
-    $ jenkins-jobs --conf jobs/config.ini.in test jobs/jobs.yml -o output
+    jenkins-jobs --conf jobs/config.ini.in test jobs/jobs.yml -o output
 
 .. note::
    A folder named ``output`` should contain one file per each jenkins job
@@ -94,7 +94,7 @@ Create your own ``jobs/config.ini`` by copying it from ``jobs/config.ini.in``:
 
 .. code-block:: shell
 
-    $ cp jobs/config.ini.in jobs/config.ini
+    cp jobs/config.ini.in jobs/config.ini
 
 Add your own credentials to jobs/config.ini.
 You can find them when you log into Jenkins and copy your API token
@@ -119,7 +119,7 @@ Now finally install the jobs on the server:
 
 .. code-block:: shell
 
-    $ ./update_jobs.sh
+    ./update_jobs.sh
 
 Manual Configuration
 --------------------

requirements.txt

@@ -1,18 +1,25 @@
-ansible==2.5.5
-appdirs==1.4.3
+ansible==2.7.0
 asn1crypto==0.24.0
+bcrypt==3.1.4
+certifi==2018.8.24
 cffi==1.11.5
+chardet==3.0.4
 cryptography==2.3.1
-enum34==1.1.6
-idna==2.6
-ipaddress==1.0.22
+fasteners==0.14.1
+idna==2.7
 Jinja2==2.10
 MarkupSafe==1.0
-packaging==17.1
-paramiko==2.4.1
-pyasn1==0.4.3
-pycparser==2.18
-pyparsing==2.2.0
+monotonic==1.5
+multi-key-dict==2.0.3
+paramiko==2.4.2
+pbr==4.3.0
+pyasn1==0.4.4
+pycparser==2.19
+PyNaCl==1.3.0
+pyparsing==2.2.2
+python-jenkins==1.2.1
+PyYAML==3.13
 requests==2.19.1
-PyYAML==3.12
 six==1.11.0
+stevedore==1.29.0
+urllib3==1.23