From 8843e4332912b204891b051614a7508438bdd41a Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sun, 23 Feb 2020 16:22:37 +0100
Subject: [PATCH] Small cleanups

* Remove usage of six, this repo is using python3 only.
* Remove settings from conf.py that are default in
  newer openstackdocstheme versions.
* Remove obsolete build_sphinx sections from setup.cfg, sphinx-build
  does not need this. Remove ignored warnerror.

Change-Id: I7b0625a71d81305d90157e42fc6a5065c9be47d1
---
 doc/source/conf.py                             | 18 ------------------
 .../cmds/check_all_candidacies.py              |  2 +-
 openstack_election/utils.py                    |  6 +++---
 requirements.txt                               |  1 -
 setup.cfg                                      |  9 ---------
 5 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index fd7a04ac..7716d90c 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -11,7 +11,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import subprocess
 import sys
 import os
 
@@ -134,12 +133,6 @@ html_title = 'OpenStack Governance'
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local",
-           "-n1"]
-html_last_updated_fmt = subprocess.check_output(git_cmd).decode('utf-8')
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 #html_use_smartypants = True
@@ -183,17 +176,6 @@ htmlhelp_basename = 'Tempestdoc'
 
 # -- Options for LaTeX output --------------------------------------------------
 
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
diff --git a/openstack_election/cmds/check_all_candidacies.py b/openstack_election/cmds/check_all_candidacies.py
index 671cad6e..9e8c7ac8 100755
--- a/openstack_election/cmds/check_all_candidacies.py
+++ b/openstack_election/cmds/check_all_candidacies.py
@@ -15,11 +15,11 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 import argparse
+import input
 import os
 
 from openstack_election.cmds import ci_check_all_candidate_files as checks
 from openstack_election import utils
-from six.moves import input
 
 results = []
 
diff --git a/openstack_election/utils.py b/openstack_election/utils.py
index 1e0b952a..d9084866 100644
--- a/openstack_election/utils.py
+++ b/openstack_election/utils.py
@@ -24,9 +24,9 @@ import sys
 import time
 import yaml
 
-from six.moves.urllib.error import HTTPError
-from six.moves.urllib.parse import quote_plus
-from six.moves.urllib.request import urlopen
+from urllib.error import HTTPError
+from urllib.parse import quote_plus
+from urllib.request import urlopen
 
 from openstack_election import config
 from openstack_election import exception
diff --git a/requirements.txt b/requirements.txt
index 8db6ba96..acf69f4c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-six>=1.9.0 # MIT
 pytz>=2013.6 # MIT
 PyYAML>=3.10 # MIT
 requests>=2.14.2 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index 82f2d0c5..096d1af9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,12 +34,3 @@ console_scripts =
     owners = openstack_election.cmds.change_owners:main
     template-emails = openstack_election.cmds.template_emails:main
     setup-election-config = openstack_election.cmds.setup_election_config:main
-
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-builders = html
-
-[pbr]
-warnerrors = True