Merge "Cleanup py27 support"
This commit is contained in:
Zuul
Gerrit Code Review
commit
03df77d5dd
|
|
@ -22,4 +22,5 @@ class ReverseDns(horizon.Panel):
|
|||
slug = 'reverse_dns'
|
||||
permissions = ('openstack.services.dns',)
|
||||
|
||||
|
||||
dashboard.Project.register(ReverseDns)
|
||||
|
|
|
|||
|
|
@ -22,4 +22,5 @@ class Zones(horizon.Panel):
|
|||
slug = 'dnszones'
|
||||
permissions = ('openstack.services.dns',)
|
||||
|
||||
|
||||
dashboard.Project.register(Zones)
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
openstackdocstheme>=1.30.0 # Apache-2.0
|
||||
sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
|
||||
openstackdocstheme>=2.0.0 # Apache-2.0
|
||||
sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ extensions = [
|
|||
repository_name = 'openstack/designate-dashboard'
|
||||
bug_project = 'designate-dashboard'
|
||||
bug_tag = ''
|
||||
html_last_updated_fmt = '%Y-%m-%d %H:%M'
|
||||
html_theme = 'openstackdocs'
|
||||
|
||||
# autodoc generation is a bit aggressive and a ndashboardsance when doing heavy
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ alabaster==0.7.10
|
|||
appdirs==1.4.3
|
||||
asn1crypto==0.24.0
|
||||
astroid==1.3.8
|
||||
Babel==2.3.4
|
||||
certifi==2018.1.18
|
||||
cffi==1.11.5
|
||||
chardet==3.0.4
|
||||
|
|
@ -49,7 +48,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
|
||||
|
|
@ -99,7 +98,7 @@ semantic-version==2.6.0
|
|||
simplejson==3.13.2
|
||||
six==1.11.0
|
||||
snowballstemmer==1.2.1
|
||||
Sphinx==1.6.2
|
||||
Sphinx==2.0.0
|
||||
sphinxcontrib-websupport==1.0.1
|
||||
stevedore==1.28.0
|
||||
termcolor==1.1.0
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ extensions = [
|
|||
repository_name = 'openstack/designate-dashboard'
|
||||
bug_project = 'designate-dashboard'
|
||||
bug_tag = ''
|
||||
html_last_updated_fmt = '%Y-%m-%d %H:%M'
|
||||
html_theme = 'openstackdocs'
|
||||
|
||||
# Add any paths that contain templates here, relative to this directory.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
# process, which may cause wedges in the gate later.
|
||||
oslo.log>=3.36.0 # Apache-2.0
|
||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||
Babel!=2.4.0,>=2.3.4 # BSD
|
||||
python-designateclient>=2.7.0 # Apache-2.0
|
||||
|
||||
horizon>=17.1.0 # Apache-2.0
|
||||
|
|
|
|||
12
setup.cfg
12
setup.cfg
|
|
@ -6,6 +6,7 @@ description-file =
|
|||
author = OpenStack
|
||||
author-email = openstack-discuss@lists.openstack.org
|
||||
home-page = https://docs.openstack.org/developer/designate-dashboard/
|
||||
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
|
||||
|
|
@ -21,15 +24,6 @@ classifier =
|
|||
packages =
|
||||
designatedashboard
|
||||
|
||||
[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 = designatedashboard/locale
|
||||
domain = django
|
||||
|
|
|
|||
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)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# 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.
|
||||
hacking>=1.1.0,<1.2.0 # Apache-2.0
|
||||
hacking>=3.0,<3.1.0 # Apache-2.0
|
||||
|
||||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
mock>=2.0.0 # BSD
|
||||
|
|
@ -10,6 +10,6 @@ pylint==1.4.5 # GPLv2
|
|||
testrepository>=0.0.18 # Apache-2.0/BSD
|
||||
testtools>=2.2.0 # MIT
|
||||
unittest2>=1.1.0 # BSD
|
||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
|
||||
openstackdocstheme>=1.18.1 # Apache-2.0
|
||||
sphinx>=2.0.0,!=2.1.0 # BSD
|
||||
openstackdocstheme>=2.0.0 # Apache-2.0
|
||||
reno>=2.5.0 # Apache-2.0
|
||||
|
|
|
|||
4
tox.ini
4
tox.ini
|
|
@ -54,9 +54,9 @@ commands =
|
|||
# E123, E125 skipped as they are invalid PEP-8.
|
||||
# F405 TEMPLATES may be undefined, or defined from star imports.
|
||||
# (because it is not easy to avoid this in openstack_dashboard.test.settings)
|
||||
|
||||
# W504 line break after binary operator
|
||||
show-source = True
|
||||
ignore = E123,E125,F405
|
||||
ignore = E123,E125,F405,W504
|
||||
builtins = _
|
||||
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,releasenotes,node_modules
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue