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
- 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
- Update requirements, no need for python_version anymore
- Switch to using sphinx-build
- 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.
- Update lower-constraints for osprofiler as required by
  other dependencies.

Change-Id: I84ec7cae5b051bb9c69969d8ccaa28b053914840
changes/97/720797/3
Andreas Jaeger 1 year ago
parent
commit
4d19dcd9ea
9 changed files with 11 additions and 40 deletions
  1. +2
    -4
      doc/requirements.txt
  2. +0
    -4
      doc/source/conf.py
  3. +3
    -3
      lower-constraints.txt
  4. +0
    -6
      releasenotes/source/conf.py
  5. +0
    -1
      requirements.txt
  6. +3
    -9
      setup.cfg
  7. +0
    -9
      setup.py
  8. +2
    -3
      test-requirements.txt
  9. +1
    -1
      tox.ini

+ 2
- 4
doc/requirements.txt View File

@ -1,13 +1,11 @@
# 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
doc8>=0.6.0 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
sphinx>=2.0.0,!=2.1.0 # BSD
mock>=2.0.0 # BSD
os-api-ref>=1.4.0 # Apache-2.0
ddt>=1.0.1 # MIT
fixtures>=3.0.0 # Apache-2.0/BSD
oslotest>=3.2.0 # Apache-2.0

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

@ -15,8 +15,6 @@
import os
import sys
import openstackdocstheme
sys.path.insert(0, os.path.abspath('../..'))
# -- General configuration ----------------------------------------------------
@ -33,7 +31,6 @@ extensions = [
repository_name = 'openstack/manila-ui'
bug_project = 'manila-ui'
bug_tag = 'docs'
html_last_updated_fmt = '%Y-%m-%d %H:%M'
# autodoc generation is a bit aggressive and a nuisance when doing heavy
# text edit cycles.
@ -65,7 +62,6 @@ pygments_style = 'sphinx'
# Sphinx are currently 'default' and 'sphinxdoc'.
# html_theme_path = ["."]
html_theme = 'openstackdocs'
html_theme_path = [openstackdocstheme.get_html_theme_path()]
# html_static_path = ['static']
# Output file base name for HTML help builder.


+ 3
- 3
lower-constraints.txt View File

@ -46,7 +46,7 @@ msgpack==0.5.6
munch==2.2.0
netaddr==0.7.19
netifaces==0.10.6
openstackdocstheme==1.18.1
openstackdocstheme==2.0.0
openstacksdk==0.12.0
os-client-config==1.29.0
os-service-types==1.2.0
@ -59,7 +59,7 @@ oslo.log==3.37.0
oslo.policy==1.34.0
oslo.serialization==2.25.0
oslo.utils==3.33.0
osprofiler==2.0.0
osprofiler==2.3.0
packaging==17.1
pbr==2.0.0
Pint==0.8.1
@ -96,7 +96,7 @@ semantic-version==2.6.0
simplejson==3.13.2
six==1.10.0
snowballstemmer==1.2.1
Sphinx==1.6.2
Sphinx==2.0.0
sphinxcontrib-websupport==1.0.1
stevedore==1.28.0
testrepository==0.0.18


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

@ -31,8 +31,6 @@
# -- General configuration ------------------------------------------------
import openstackdocstheme
# If your documentation needs a minimal Sphinx version, state it here.
# needs_sphinx = '1.0'
@ -48,7 +46,6 @@ extensions = [
repository_name = 'openstack/manila-ui'
bug_project = 'manila-ui'
bug_tag = 'release notes'
html_last_updated_fmt = '%Y-%m-%d %H:%M'
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@ -121,9 +118,6 @@ html_theme = 'openstackdocs'
# documentation.
# html_theme_options = {}
# Add any paths that contain custom themes here, relative to this directory.
html_theme_path = [openstackdocstheme.get_html_theme_path()]
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
# html_title = None


+ 0
- 1
requirements.txt View File

@ -4,7 +4,6 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0
# Horizon Core Requirements
Babel!=2.4.0,>=2.3.4 # BSD
django-compressor>=2.0 # MIT
iso8601>=0.1.11 # MIT
oslo.utils>=3.33.0 # Apache-2.0


+ 3
- 9
setup.cfg View File

@ -6,6 +6,7 @@ description-file =
author = OpenStack
author-email = openstack-discuss@lists.openstack.org
home-page = https://docs.openstack.org/manila-ui/latest/
python-requires = >=3.6
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@ -13,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
@ -20,12 +23,3 @@ classifier =
[files]
packages =
manila_ui
[build_sphinx]
source-dir = doc/source
build-dir = doc/build
all_files = 1
warning-is-error = 1
[upload_sphinx]
upload-dir = doc/build/html

+ 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)

+ 2
- 3
test-requirements.txt View File

@ -6,9 +6,8 @@ hacking>=3.0,<3.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
ddt>=1.0.1 # MIT
python-subunit>=1.0.0 # Apache-2.0/BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
openstackdocstheme>=1.18.1 # Apache-2.0
openstackdocstheme>=2.0.0 # Apache-2.0
sphinx>=2.0.0,!=2.1.0 # BSD
pytest>=5.3.5 # MIT
testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD


+ 1
- 1
tox.ini View File

@ -51,7 +51,7 @@ commands = {toxinidir}/tools/cover.sh {posargs}
whitelist_externals = rm
commands =
rm -rf doc/build
python setup.py build_sphinx
sphinx-build -W -b html doc/source doc/build/html
[testenv:pdf-docs]
usedevelop = True


Loading…
Cancel
Save