Split requirements for py27 and >py36

Pin requirements for py27 and keep them open for py36 and later.

Change-Id: Ia9d41eb94b3efe68556804dd35d81e67e73c0d92
This commit is contained in:
Ilya Shakhat 2020-03-09 18:35:57 +04:00
parent c3abdaa382
commit b53f04368c
3 changed files with 15 additions and 12 deletions

View File

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -28,10 +27,8 @@ on_zuul = "ZUUL_PROJECT" in os.environ
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.autosectionlabel',
#'sphinx.ext.intersphinx',
'sphinxcontrib.programoutput',
'ext.driver_doc',
'openstackdocstheme',
]
version = os_faults.get_version()
@ -50,7 +47,7 @@ master_doc = 'index'
# General information about the project.
project = u'os-faults'
copyright = u'2016, OpenStack Foundation'
copyright = u'2016-2020, OS-Faults contributors'
# If true, '()' will be appended to :func: etc. cross-reference text.
add_function_parentheses = True

View File

@ -8,10 +8,15 @@ appdirs>=1.3.0 # MIT License
click>=6.7 # BSD
iso8601>=0.1.11 # MIT
jsonschema>=2.6.0 # MIT
oslo.concurrency>=3.0.0 # Apache-2.0
oslo.i18n>=2.1.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.utils>=3.20.0 # Apache-2.0
pyghmi>=1.0.9 # Apache-2.0
oslo.concurrency>=3.0.0,<4.0.0;python_version=='2.7' # Apache-2.0
oslo.concurrency>=3.0.0;python_version>='3.6' # Apache-2.0
oslo.i18n>=2.1.0,<4.0.0;python_version=='2.7' # Apache-2.0
oslo.i18n>=2.1.0;python_version>='3.6' # Apache-2.0
oslo.serialization>=1.10.0,<3.0.0;python_version=='2.7' # Apache-2.0
oslo.serialization>=1.10.0;python_version>='3.6' # Apache-2.0
oslo.utils>=3.20.0,<4.0.0;python_version=='2.7' # Apache-2.0
oslo.utils>=3.20.0;python_version>='3.6' # Apache-2.0
pyghmi>=1.0.9,<1.5.0;python_version=='2.7' # Apache-2.0
pyghmi>=1.0.9;python_version>='3.6'
PyYAML>=3.10.0 # MIT
six>=1.9.0 # MIT

View File

@ -16,11 +16,12 @@ sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7;python_version>='3.4' # BSD
sphinxcontrib-programoutput # BSD
sphinx_rtd_theme # MIT
openstackdocstheme>=1.11.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
oslotest>=1.10.0,<4.0.0;python_version=='2.7' # Apache-2.0
oslotest>=1.10.0;python_version>='3.6' # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT
# releasenotes
reno>=1.8.0 # Apache-2.0
reno>=1.8.0,<3.0.0;python_version=='2.7' # Apache-2.0
reno>=1.8.0;python_version>='3.6' # Apache-2.0