From 011db0c380a07ed03b1068ab80dc0f266a190acf Mon Sep 17 00:00:00 2001
From: Jochem Kuijpers <git@jochemkuijpers.nl>
Date: Wed, 3 Jul 2019 17:10:48 +0200
Subject: [PATCH 1/3] Add a title attribute to status image icons matching
 their alt attribute.

Update README.rst

Remove broken link to image that was at

.. image:: http://shieldkins.elrod.me/fedora/nuancier

Update development.rst

Change yum to dnf

Update manual install directions

Co-Authored-By: Clement Verna <cverna@users.noreply.github.com>

Use Python3

Remove , sshfs_opts_append: "-o nonempty" since the nonempty option is no longer available.

Update Vagrantfile.example
---
 README.rst                                    | 33 ++++++++++++++-----
 Vagrantfile.example                           | 12 +++----
 .../ansible/roles/nuancier-dev/tasks/main.yml | 22 ++++++++-----
 doc/deployment.rst                            |  4 +--
 doc/development.rst                           |  4 +--
 nuancier/templates/admin_index.html           |  6 ++++
 nuancier/templates/admin_review.html          |  5 ++-
 nuancier/templates/admin_review_ro.html       |  5 ++-
 nuancier/templates/contributions.html         |  3 ++
 nuancier/templates/elections_list.html        |  6 ++++
 10 files changed, 71 insertions(+), 29 deletions(-)

diff --git a/README.rst b/README.rst
index 89b0f7b..bbd85d5 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,6 @@
 nuancier
 ========
 
-.. image:: http://shieldkins.elrod.me/fedora/nuancier
-
 :Author: Pierre-Yves Chibon <pingou@pingoured.fr>
 
 
@@ -61,7 +59,7 @@ The best way to set up a development enviroment is to use `Vagrant <https://vagr
 Vagrant provisions a new virtual machine and then runs the Ansible playbook on it automatically.
 To get started, install Vagrant::
 
-    $ sudo dnf install vagrant libvirt vagrant-libvirt vagrant-sshfs ansible
+    $ sudo dnf install vagrant libvirt vagrant-libvirt vagrant-sshfs ansible git
 
 Next, clone the repository and copy the example Vagrantfile from ``Vagrantfile.example``::
 
@@ -78,22 +76,41 @@ All done! The VM contains all the required dependencies pre-installed.
 Manual
 ^^^^^^
 
+Instructions here have been tested on Fedora 30, using Python3
+
+Get git and python3:
+
+    sudo dnf install git python3
+
 Clone the source::
 
- git clone https://github.com/fedora-infra/nuancier.git
+    git clone https://github.com/fedora-infra/nuancier.git
 
+Install Python requirements
 
+    pip3 install -r requirements.txt
+ 
 Create the database scheme::
 
- python createdb.py
-
+    python3 createdb.py
 
-Run the server::
+Run the server locally::
 
- python runserver.py
+    python3 runserver.py
 
 You should be able to access the server at http://localhost:5000
 
+or to run the server externally, first open relevant port in firewall::
+
+    sudo firewall-cmd --add-port 5000/tcp --permanent
+    sudo firewall-cmd --reload 
+ 
+then run the server::
+
+    python3 runserver.py --host 0.0.0.0
+
+You should be able to access the server at http://ip.address:5000
+
 .. note:: To tweak the configuration, you may either change
    ``default_config.py`` in the nuancier module, or copy the file
    ``utility/nuancier.cfg.sample`` into ``nuancier.cfg`` and run the
diff --git a/Vagrantfile.example b/Vagrantfile.example
index efd7e78..b924e4b 100644
--- a/Vagrantfile.example
+++ b/Vagrantfile.example
@@ -9,11 +9,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
  # If you'd prefer to pull your boxes from Hashicorp's repository, you can
  # replace the config.vm.box and config.vm.box_url declarations with the line below.
  #
- # config.vm.box = "fedora/25-cloud-base"
- config.vm.box = "f25-cloud-libvirt"
+ # config.vm.box = "fedora/30-cloud-base"
+ config.vm.box = "f30-cloud-libvirt"
  config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases"\
-                     "/25/CloudImages/x86_64/images/Fedora-Cloud-Base-Vagrant-25-1"\
-                     ".3.x86_64.vagrant-libvirt.box"
+                     "/30/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-30-1"\
+                     ".2.x86_64.vagrant-libvirt.box"
 
  # Forward traffic on the host to the development server on the guest.
  # You can change the host port that is forwarded to 5000 on the guest
@@ -31,7 +31,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
  # Vagrant can share the source directory using rsync, NFS, or SSHFS (with the vagrant-sshfs
  # plugin). Consult the Vagrant documentation if you do not want to use SSHFS.
  config.vm.synced_folder ".", "/vagrant", disabled: true
- config.vm.synced_folder ".", "/home/vagrant/devel", type: "sshfs", sshfs_opts_append: "-o nonempty"
+ config.vm.synced_folder ".", "/home/vagrant/devel", type: "sshfs"
 
  # To cache update packages (which is helpful if frequently doing `vagrant destroy && vagrant up`)
  # you can create a local directory and share it to the guest's DNF cache. Uncomment the lines below
@@ -44,7 +44,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
  config.vm.provision "shell", inline: "sudo dnf upgrade -y"
 
  # bootstrap and run with ansible
- config.vm.provision "shell", inline: "sudo dnf -y install python2-dnf libselinux-python"
+ config.vm.provision "shell", inline: "sudo dnf -y install python3-dnf python3-libselinux"
  config.vm.provision "ansible" do |ansible|
      ansible.playbook = "devel/ansible/vagrant-playbook.yml"
  end
diff --git a/devel/ansible/roles/nuancier-dev/tasks/main.yml b/devel/ansible/roles/nuancier-dev/tasks/main.yml
index ab03702..f750a60 100644
--- a/devel/ansible/roles/nuancier-dev/tasks/main.yml
+++ b/devel/ansible/roles/nuancier-dev/tasks/main.yml
@@ -1,16 +1,20 @@
 ---
 
 - name: Install helpful development packages
-  dnf: name={{ item }} state=present
-  with_items:
+  dnf: 
+    name: "{{ item }}" 
+    state: present
+  loop:
     - git
-    - python-sphinx
-    - python-virtualenvwrapper
+    - python3-sphinx
+    - python3-virtualenvwrapper
     - vim-enhanced
 
 - name: Install nuancier system dependencies
-  dnf: name={{ item }} state=present
-  with_items:
+  dnf: 
+    name: "{{ item }}" 
+    state: present
+  loop:
     - gcc
     - libffi-devel
     - openssl-devel
@@ -49,7 +53,7 @@
   pip:
     requirements: "requirements.txt"
     virtualenv: /home/{{ ansible_env.SUDO_USER }}/.virtualenvs/nuancier/
-    virtualenv_python: python2
+    virtualenv_python: python3
   args:
     chdir: /home/{{ ansible_env.SUDO_USER }}/devel
 
@@ -58,7 +62,7 @@
   pip:
     requirements: "test-requirements.txt"
     virtualenv: /home/{{ ansible_env.SUDO_USER }}/.virtualenvs/nuancier/
-    virtualenv_python: python2
+    virtualenv_python: python3
   args:
     chdir: /home/{{ ansible_env.SUDO_USER }}/devel
 
@@ -68,7 +72,7 @@
     name: "file:///home/{{ ansible_env.SUDO_USER }}/devel"
     extra_args: "-e"
     virtualenv: /home/{{ ansible_env.SUDO_USER }}/.virtualenvs/nuancier/
-    virtualenv_python: python2
+    virtualenv_python: python3
 
 
 # Create and configure the database
diff --git a/doc/deployment.rst b/doc/deployment.rst
index e8d80a0..43b68dc 100644
--- a/doc/deployment.rst
+++ b/doc/deployment.rst
@@ -31,7 +31,7 @@ From system-wide packages
 
 Start by install nuancier::
 
-  yum install nuancier
+  dnf install nuancier
 
 Adjust the configuration files: ``/etc/nuancier/nuancier.cfg``.
 See :doc:`configuration` for detailed information about the configuration.
@@ -48,7 +48,7 @@ Set-up WSGI
 
 Start by installing ``mod_wsgi``::
 
-  yum install mod_wsgi
+  dnf install mod_wsgi
 
 
 Then configure apache::
diff --git a/doc/development.rst b/doc/development.rst
index 1830c9e..3a8d893 100644
--- a/doc/development.rst
+++ b/doc/development.rst
@@ -62,7 +62,7 @@ We are also inspecting the code using `pylint
 
           ::
 
-            yum install python-pep8 pylint
+            dnf install python-pep8 pylint
 
 
 Send patch
@@ -147,7 +147,7 @@ error or failure. For example, the command could be:
 
           ::
 
-            yum install python-coverage
+            dnf install python-coverage
 
 
 Database changes
diff --git a/nuancier/templates/admin_index.html b/nuancier/templates/admin_index.html
index 3b867fb..6df66c0 100644
--- a/nuancier/templates/admin_index.html
+++ b/nuancier/templates/admin_index.html
@@ -39,9 +39,11 @@ <h3>Admin interface</h3>
         <td>
             {% if election.submission_open %}
             <img src="{{ url_for('static', filename='Approved.png') }}"
+                title="Submission open"
                 alt="Submission open"/>
             {% else %}
             <img src="{{ url_for('static', filename='Denied.png') }}"
+                title="Submission closed"
                 alt="Submission closed"/>
             {% endif %}
             {{ election.submission_date_start }}
@@ -49,9 +51,11 @@ <h3>Admin interface</h3>
         <td>
             {% if election.election_open %}
             <img src="{{ url_for('static', filename='Approved.png') }}"
+                title="Election open"
                 alt="Election open"/>
             {% else %}
             <img src="{{ url_for('static', filename='Denied.png') }}"
+                title="Election closed"
                 alt="Election closed"/>
             {% endif %}
             {{ election.election_date_start }}
@@ -59,9 +63,11 @@ <h3>Admin interface</h3>
         <td>
             {% if election.election_public %}
             <img src="{{ url_for('static', filename='Approved.png') }}"
+                title="Election's results published"
                 alt="Election's results published"/>
             {% else %}
             <img src="{{ url_for('static', filename='Denied.png') }}"
+                title="Election's results closed"
                 alt="Election's results closed"/>
             {% endif %}
             {{ election.election_date_end }}
diff --git a/nuancier/templates/admin_review.html b/nuancier/templates/admin_review.html
index 62efffa..d892b4e 100644
--- a/nuancier/templates/admin_review.html
+++ b/nuancier/templates/admin_review.html
@@ -22,7 +22,7 @@ <h1>Review election: {{ election.election_name }} - {{ election.election_year }}
 
 <h3>Overview</h3>
 <p>Here below are presented all the candidates of the election {{ election.election_name }}
-from {{ election.election_year }}, regardless of wether they are valid
+from {{ election.election_year }}, regardless of whether they are valid
 candidates or not.
 </p>
 <p>
@@ -111,12 +111,15 @@ <h3>Overview</h3>
         <td>
             {% if candidate.approved == true%}
             <img src="{{ url_for('static', filename='Approved.png') }}"
+                title="Candidate approved"
                 alt="Candidate approved"/>
             {% elif candidate.denied == true %}
             <img src="{{ url_for('static', filename='Denied.png') }}"
+                title="Candidate denied"
                 alt="Candidate denied"/>
             {% else %}
             <img src="{{ url_for('static', filename='New.png') }}"
+                title="Candidate Pending Review"
                 alt="Candidate Pending Review"/>
             {% endif %}
         </td>
diff --git a/nuancier/templates/admin_review_ro.html b/nuancier/templates/admin_review_ro.html
index 208fd2c..c0e1c56 100644
--- a/nuancier/templates/admin_review_ro.html
+++ b/nuancier/templates/admin_review_ro.html
@@ -22,7 +22,7 @@ <h1>Review election: {{ election.election_name }} - {{ election.election_year }}
 
 <h3>Overview</h3>
 <p>Here below are presented all the candidates of the election {{ election.election_name }}
-from {{ election.election_year }}, regardless of wether they are valid
+from {{ election.election_year }}, regardless of whether they are valid
 candidates or not.
 </p>
 <p>
@@ -97,12 +97,15 @@ <h3>Overview</h3>
         <td>
             {% if candidate.approved == true%}
             <img src="{{ url_for('static', filename='Approved.png') }}"
+                title="Candidate approved"
                 alt="Candidate approved"/>
             {% elif candidate.denied == true %}
             <img src="{{ url_for('static', filename='Denied.png') }}"
+                title="Candidate denied"
                 alt="Candidate denied"/>
             {% else %}
             <img src="{{ url_for('static', filename='New.png') }}"
+                title="Candidate Pending Review"
                 alt="Candidate Pending Review"/>
             {% endif %}
         </td>
diff --git a/nuancier/templates/contributions.html b/nuancier/templates/contributions.html
index 254c4b0..322b9e4 100644
--- a/nuancier/templates/contributions.html
+++ b/nuancier/templates/contributions.html
@@ -62,12 +62,15 @@ <h3>Overview</h3>
         <td>
             {% if candidate.approved == true %}
             <img src="{{ url_for('static', filename='Approved.png') }}"
+                title="Candidate approved"
                 alt="Candidate approved"/>
             {% elif candidate.denied == true %}
             <img src="{{ url_for('static', filename='Denied.png') }}"
+                title="Candidate denied"
                 alt="Candidate denied"/>
             {% else %}
             <img src="{{ url_for('static', filename='New.png') }}"
+                title="Candidate pending review"
                 alt="Candidate pending review"/>
             {% endif %}
         </td>
diff --git a/nuancier/templates/elections_list.html b/nuancier/templates/elections_list.html
index bf2198d..f3b09ab 100644
--- a/nuancier/templates/elections_list.html
+++ b/nuancier/templates/elections_list.html
@@ -38,9 +38,11 @@ <h1>Elections</h1>
         <td>
             {% if election.submission_open %}
             <img src="{{ url_for('static', filename='Approved.png') }}"
+                title="Submission open"
                 alt="Submission open"/>
             {% else %}
             <img src="{{ url_for('static', filename='Denied.png') }}"
+                title="Submission closed"
                 alt="Submission closed"/>
             {% endif %}
             {{ election.submission_date_start }}
@@ -48,9 +50,11 @@ <h1>Elections</h1>
         <td>
             {% if election.election_open %}
             <img src="{{ url_for('static', filename='Approved.png') }}"
+                title="Election open"
                 alt="Election open"/>
             {% else %}
             <img src="{{ url_for('static', filename='Denied.png') }}"
+                title="Election open"
                 alt="Election open"/>
             {% endif %}
             {{ election.election_date_start }}
@@ -59,10 +63,12 @@ <h1>Elections</h1>
             {% if election.election_public %}
             <a href="{{ url_for('results', election_id=election.id) }}">
                 <img src="{{ url_for('static', filename='Approved.png') }}"
+                    title="Election published"
                     alt="Election published"/>
             </a>
             {% else %}
             <img src="{{ url_for('static', filename='Denied.png') }}"
+                title="Election closed"
                 alt="Election closed"/>
             {% endif %}
             {{ election.election_date_end }}

From 3838ea6927c1f2977d24bf9ec433e2f6e1c2489e Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Sat, 5 Oct 2019 17:27:32 +0300
Subject: [PATCH 2/3] Update 7db0e24a2a85_add_submission_end_date.py

Change print statement to be compatible with Python 3
---
 alembic/versions/7db0e24a2a85_add_submission_end_date.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alembic/versions/7db0e24a2a85_add_submission_end_date.py b/alembic/versions/7db0e24a2a85_add_submission_end_date.py
index a188aba..27c2510 100644
--- a/alembic/versions/7db0e24a2a85_add_submission_end_date.py
+++ b/alembic/versions/7db0e24a2a85_add_submission_end_date.py
@@ -29,7 +29,7 @@ def upgrade():
             "submission_date_end=election_date_start;"
         op.execute(ins)
     except Exception as err:
-        print 'ERROR', err
+        print('ERROR', err)
 
     ## Enforce the nullable=False
     op.alter_column(

From 1e838e7cdb6808f755811470eb5a83be54753c4b Mon Sep 17 00:00:00 2001
From: jontrossbach <jtrossba@redhat.com>
Date: Fri, 5 Jun 2020 13:19:00 -0400
Subject: [PATCH 3/3] update werkzeug library to invoke required workzeug.utils

update test requirements

remove Python2 from rpm dependencies

update travis ci file to use only python 3.7

Use Fedora 32 image instead of Fedora 25

Update Vagrantfile.example
---
 .travis.yml                                     | 5 +----
 README.rst                                      | 2 +-
 Vagrantfile.example                             | 8 ++++----
 devel/ansible/roles/nuancier-dev/tasks/main.yml | 3 +--
 nuancier/__init__.py                            | 2 +-
 nuancier/ui.py                                  | 2 +-
 requirements.txt                                | 1 +
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 21e57bc..674b998 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,7 @@
 sudo: false
 language: python
 python:
- - "2.7"
- - "3.4"
- - "3.5"
- - "3.6"
+ - "3.7"
 
 install:
  - pip install tox-travis
diff --git a/README.rst b/README.rst
index bbd85d5..845e462 100644
--- a/README.rst
+++ b/README.rst
@@ -37,7 +37,7 @@ order to increase the loading speed of the pages.
 
 The dependency list is therefore:
 
-- `python`_ (2.5 minimum)
+- `python`_ (3.7 minimum)
 - `python-flask`_
 - `python-flask-wtf`_
 - `python-wtforms`_
diff --git a/Vagrantfile.example b/Vagrantfile.example
index b924e4b..ad6ad98 100644
--- a/Vagrantfile.example
+++ b/Vagrantfile.example
@@ -9,11 +9,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
  # If you'd prefer to pull your boxes from Hashicorp's repository, you can
  # replace the config.vm.box and config.vm.box_url declarations with the line below.
  #
- # config.vm.box = "fedora/30-cloud-base"
- config.vm.box = "f30-cloud-libvirt"
+ # config.vm.box = "fedora/32-cloud-base"
+ config.vm.box = "f32-cloud-libvirt"
  config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases"\
-                     "/30/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-30-1"\
-                     ".2.x86_64.vagrant-libvirt.box"
+                     "/32/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-32-1"\
+                     ".6.x86_64.vagrant-libvirt.box"
 
  # Forward traffic on the host to the development server on the guest.
  # You can change the host port that is forwarded to 5000 on the guest
diff --git a/devel/ansible/roles/nuancier-dev/tasks/main.yml b/devel/ansible/roles/nuancier-dev/tasks/main.yml
index f750a60..edfd8b1 100644
--- a/devel/ansible/roles/nuancier-dev/tasks/main.yml
+++ b/devel/ansible/roles/nuancier-dev/tasks/main.yml
@@ -18,10 +18,9 @@
     - gcc
     - libffi-devel
     - openssl-devel
-    - python2-devel
     - python3-devel
     - redhat-rpm-config
-    - rpm-python
+    - python3-rpm
 
 # Add various helpful configuration files
 - name: Install a custom bashrc
diff --git a/nuancier/__init__.py b/nuancier/__init__.py
index b827a1c..12f9d30 100644
--- a/nuancier/__init__.py
+++ b/nuancier/__init__.py
@@ -37,7 +37,7 @@
 from flask_fas_openid import FAS
 from six.moves.urllib.parse import urlparse, urljoin
 from sqlalchemy.exc import SQLAlchemyError
-from werkzeug import secure_filename
+from werkzeug.utils import secure_filename
 
 try:
     from PIL import Image
diff --git a/nuancier/ui.py b/nuancier/ui.py
index a4be5ca..a0b1440 100644
--- a/nuancier/ui.py
+++ b/nuancier/ui.py
@@ -33,7 +33,7 @@
 from sqlalchemy.exc import SQLAlchemyError
 ## pylint cannot import flask dependency correctly
 # pylint: disable=E0611
-from werkzeug import secure_filename
+from werkzeug.utils import secure_filename
 
 import nuancier
 import nuancier.lib as nuancierlib
diff --git a/requirements.txt b/requirements.txt
index a2d5a0b..b7a4927 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,7 @@ blinker # required by flask for tests
 dogpile.cache
 flask
 flask-wtf
+flask-oidc
 Pillow
 python-fedora >= 0.3.33
 python-openid