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 - Add requires on python >= 3.6 to setup.cfg so that pypi and pip know about the requirement - Remove obsolete sections from setup.cfg - Update classifiers - Use newer openstackdocstheme and Sphinx versions - Cleanup */source/conf.py to remove now obsolete content. - Remove Babel from requirements, it's not needed for running. - Sync docs deps in tox.ini Change-Id: Ie1fccdc777be978075e4689eda6c62578bd463e4
This commit is contained in:
Andreas Jaeger
parent
7c6389094c
commit
02b82e5a4c
|
|
@ -50,20 +50,8 @@ bug_tag = u'api-guide'
|
|||
repository_name = 'openstack/barbican'
|
||||
bug_project = 'barbican'
|
||||
|
||||
# Must set this variable to include year, month, day, hours, and minutes.
|
||||
html_last_updated_fmt = '%Y-%m-%d %H:%M'
|
||||
|
||||
copyright = u'2016, OpenStack contributors'
|
||||
|
||||
# The version info for the project you're documenting, acts as replacement for
|
||||
# |version| and |release|, also used in various other places throughout the
|
||||
# built documents.
|
||||
#
|
||||
from barbican.version import version_info
|
||||
# The short X.Y version.
|
||||
version = version_info.version_string()
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = version_info.release_string()
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
|
@ -144,10 +132,6 @@ html_static_path = []
|
|||
# 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
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
sphinx>=1.8.0,!=2.1.0 # BSD
|
||||
sphinx>=2.0.0,!=2.1.0 # BSD
|
||||
sphinxcontrib-httpdomain>=1.3.0 # BSD
|
||||
sphinxcontrib-blockdiag>=1.5.4 # BSD
|
||||
sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
|
||||
reno>=2.5.0 # Apache-2.0
|
||||
os-api-ref>=1.4.0 # Apache-2.0
|
||||
openstackdocstheme>=1.18.1 # Apache-2.0
|
||||
os-api-ref>=1.5.0 # Apache-2.0
|
||||
openstackdocstheme>=2.0.0 # Apache-2.0
|
||||
castellan >= 0.17 # Apache-2.0
|
||||
pykmip>=0.7.0 # Apache 2.0 License
|
||||
|
|
|
|||
|
|
@ -59,9 +59,6 @@ bug_tag = ''
|
|||
# robots.txt.
|
||||
html_extra_path = ['_extra']
|
||||
|
||||
# Must set this variable to include year, month, day, hours, and minutes.
|
||||
html_last_updated_fmt = '%Y-%m-%d %H:%M'
|
||||
|
||||
# If true, '()' will be appended to :func: etc. cross-reference text.
|
||||
add_function_parentheses = True
|
||||
|
||||
|
|
|
|||
|
|
@ -60,9 +60,6 @@ repository_name = 'openstack/barbican'
|
|||
bug_project = 'barbican'
|
||||
bug_tag = ''
|
||||
|
||||
# Must set this variable to include year, month, day, hours, and minutes.
|
||||
html_last_updated_fmt = '%Y-%m-%d %H:%M'
|
||||
|
||||
# Release notes are version independent.
|
||||
# The short X.Y version.
|
||||
version = ''
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
alembic>=0.8.10 # MIT
|
||||
Babel!=2.4.0,>=2.3.4 # BSD
|
||||
cffi>=1.7.0 # MIT
|
||||
cryptography>=2.1 # BSD/Apache-2.0
|
||||
eventlet>=0.18.2,!=0.18.3,!=0.20.1 # MIT
|
||||
|
|
|
|||
31
setup.cfg
31
setup.cfg
|
|
@ -7,6 +7,7 @@ description-file =
|
|||
author = OpenStack
|
||||
author-email = openstack-discuss@lists.openstack.org
|
||||
home-page = https://docs.openstack.org/barbican/latest/
|
||||
python-requires = >=3.6
|
||||
classifier =
|
||||
Environment :: OpenStack
|
||||
Intended Audience :: Information Technology
|
||||
|
|
@ -14,9 +15,12 @@ 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
|
||||
Programming Language :: Python :: 3.8
|
||||
|
||||
[files]
|
||||
data_files =
|
||||
|
|
@ -80,30 +84,6 @@ oslo.config.opts =
|
|||
oslo.config.opts.defaults =
|
||||
barbican.common.config = barbican.common.config:set_middleware_defaults
|
||||
|
||||
[build_apiguide]
|
||||
all_files = 1
|
||||
build-dir = api-guide/build
|
||||
source-dir = api-guide/source
|
||||
|
||||
[egg_info]
|
||||
tag_build =
|
||||
tag_date = 0
|
||||
tag_svn_revision = 0
|
||||
|
||||
[compile_catalog]
|
||||
directory = barbican/locale
|
||||
domain = barbican
|
||||
|
||||
[update_catalog]
|
||||
domain = barbican
|
||||
output_dir = barbican/locale
|
||||
input_file = barbican/locale/barbican.pot
|
||||
|
||||
[extract_messages]
|
||||
keywords = _ gettext ngettext l_ lazy_gettext
|
||||
mapping_file = babel.cfg
|
||||
output_file = barbican/locale/barbican.pot
|
||||
|
||||
# TBD: OpenStack stuff...
|
||||
# NOTE(jkoelker) To run the test suite under nose install the following
|
||||
# coverage https://pypi.org/project/coverage
|
||||
|
|
@ -119,6 +99,3 @@ output_file = barbican/locale/barbican.pot
|
|||
|
||||
#[install]
|
||||
#install-lib=/usr/local/bin/vbarbican/lib/python2.7/site-packages/
|
||||
|
||||
[wheel]
|
||||
universal = 1
|
||||
|
|
|
|||
9
setup.py
9
setup.py
|
|
@ -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)
|
||||
|
|
|
|||
6
tox.ini
6
tox.ini
|
|
@ -38,7 +38,7 @@ commands =
|
|||
diff-cover --fail-under 100 --compare-branch master cover/coverage.xml
|
||||
|
||||
[testenv:releasenotes]
|
||||
deps = -r{toxinidir}/doc/requirements.txt
|
||||
deps = {[testenv:docs]deps}
|
||||
commands =
|
||||
rm -rf releasenotes/build
|
||||
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
||||
|
|
@ -92,14 +92,14 @@ commands =
|
|||
[testenv:api-guide]
|
||||
# This environment is called from CI scripts to test and publish
|
||||
# the API Guide to docs.openstack.org.
|
||||
deps = -r{toxinidir}/doc/requirements.txt
|
||||
deps = {[testenv:docs]deps}
|
||||
commands =
|
||||
rm -rf api-guide/build
|
||||
sphinx-build -W -b html -d api-guide/build/doctrees api-guide/source api-guide/build/html
|
||||
|
||||
[testenv:all-docs]
|
||||
description = Build all documentation
|
||||
deps = -r{toxinidir}/doc/requirements.txt
|
||||
deps = {[testenv:docs]deps}
|
||||
commands=
|
||||
{[testenv:docs]commands}
|
||||
{[testenv:api-guide]commands}
|
||||
|
|
|
|||
Loading…
Reference in New Issue