Browse Source

Cleanup py27 support

This repo is now testing only with Python 3, so let's make
a few cleanups:
- Remove python 2.7 stanza from setup.py
- Remove obsolete sections from setup.cfg
- Update classifiers
- Use newer openstackdocstheme and Sphinx versions
- Cleanup */source/conf.py to remove now obsolete content.
- Remove install_command from tox.ini, the default is fine

Change-Id: Ib70fcdc751a1e84d3160558361a76bbd328f4625
changes/47/720747/1
Andreas Jaeger 1 year ago
parent
commit
339f23dcf5
6 changed files with 5 additions and 32 deletions
  1. +3
    -2
      doc/requirements.txt
  2. +0
    -3
      doc/source/conf.py
  3. +0
    -4
      releasenotes/source/conf.py
  4. +2
    -13
      setup.cfg
  5. +0
    -9
      setup.py
  6. +0
    -1
      tox.ini

+ 3
- 2
doc/requirements.txt View File

@ -1,7 +1,8 @@
# 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.
openstackdocstheme>=1.20.0 # Apache-2.0
openstackdocstheme>=2.0.0 # Apache-2.0
reno>=2.5.0 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
sphinx>=2.0.0,!=2.1.0 # BSD
sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD

+ 0
- 3
doc/source/conf.py View File

@ -31,9 +31,6 @@ repository_name = 'openstack/coverage2sql'
bug_project = 'coverage2sql'
bug_tag = ''
# Must set this variable to include year, month, day, hours, and minutes.
html_last_updated_fmt = '%Y-%m-%d %H:%M'
# autodoc generation is a bit aggressive and a nuisance when doing heavy
# text edit cycles.
# execute "export SPHINX_DEBUG=1" in your terminal to disable


+ 0
- 4
releasenotes/source/conf.py View File

@ -138,10 +138,6 @@ html_static_path = ['_static']
# directly to the root of the documentation.
#html_extra_path = []
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
html_last_updated_fmt = '%Y-%m-%d %H:%M'
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
#html_use_smartypants = True


+ 2
- 13
setup.cfg View File

@ -14,6 +14,8 @@ classifier =
License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux
Programming Language :: Python
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
@ -22,10 +24,6 @@ classifier =
packages =
coverage2sql
[global]
setup-hooks =
pbr.hooks.setup_hook
[entry_points]
console_scripts =
coverage2sql = coverage2sql.shell:main
@ -33,15 +31,6 @@ console_scripts =
oslo.config.opts =
coverage2sql.shell = coverage2sql.shell:list_opts
[build_sphinx]
source-dir = doc/source
build-dir = doc/build
all_files = 1
warning-is-error = 1
[upload_sphinx]
upload-dir = doc/build/html
[compile_catalog]
directory = coverage2sql/locale
domain = coverage2sql


+ 0
- 9
setup.py View File

@ -13,17 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools
# In python < 2.7.4, a lazy loading of package `pbr` will break
# setuptools if some other modules registered functions in `atexit`.
# solution from: http://bugs.python.org/issue15881#msg170215
try:
import multiprocessing # noqa
except ImportError:
pass
setuptools.setup(
setup_requires=['pbr>=2.0.0'],
pbr=True)

+ 0
- 1
tox.ini View File

@ -7,7 +7,6 @@ ignore_basepython_conflict = True
[testenv]
basepython = python3
usedevelop = True
install_command = pip install -U --force-reinstall {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
whitelist_externals = find
deps = -r{toxinidir}/requirements.txt


Loading…
Cancel
Save