Merge "Small cleanups"

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 = [

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 = []
 

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

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

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