diff --git a/.zuul.yaml b/.zuul.yaml index 1fd1fe4..8f5ec9f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,10 @@ - project: + templates: + - check-requirements + - horizon-non-primary-django-jobs + - openstack-cover-jobs-horizon + - openstack-lower-constraints-jobs-horizon + - openstack-python3-ussuri-jobs-horizon check: jobs: - openstack-tox-pep8 diff --git a/bindep.txt b/bindep.txt new file mode 100644 index 0000000..816dcd5 --- /dev/null +++ b/bindep.txt @@ -0,0 +1,2 @@ +libpcre3-dev [platform:dpkg] +pcre-devel [platform:redhat] diff --git a/doc/source/conf.py b/doc/source/conf.py index c44daf4..03b2a75 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -27,6 +27,12 @@ # # needs_sphinx = '1.0' +extensions = ['openstackdocstheme'] + +# Settings for openstackdocstheme +repository_name = 'openstack/adjutant-ui' +use_storyboard = True + # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -43,7 +49,6 @@ master_doc = 'index' project = u'Adjutant-UI' copyright = u'2017, Catalyst IT Ltd' - # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This patterns also effect to html_static_path and html_extra_path @@ -61,7 +66,7 @@ todo_include_todos = False # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -html_theme = 'sphinx_rtd_theme' +html_theme = 'openstackdocs' # Add any paths that contain custom themes here, relative to this directory. # html_theme_path = sphinx_bootstrap_theme.get_html_theme_path() diff --git a/lower-constraints.txt b/lower-constraints.txt new file mode 100644 index 0000000..0d4044c --- /dev/null +++ b/lower-constraints.txt @@ -0,0 +1,147 @@ +alabaster==0.7.12 +appdirs==1.4.3 +attrs==19.3.0 +Babel==2.8.0 +certifi==2019.11.28 +cffi==1.14.0 +chardet==3.0.4 +cliff==3.0.0 +cmd2==0.8.9 +coverage==4.0 +cryptography==2.8 +debtcollector==2.0.0 +decorator==4.4.2 +Django==2.2.11 +django-appconf==1.0.3 +django-compressor==2.4 +django-debreach==2.0.1 +django-pyscss2==3.0.0 +docutils==0.15.2 +dogpile.cache==0.9.0 +dulwich==0.19.15 +enmerkar==0.7.1 +extras==1.0.0 +fasteners==0.14.1 +fixtures==3.0.0 +flake8==2.5.5 +futurist==2.1.0 +hacking==0.12.0 +horizon==18.1.0 +idna==2.9 +imagesize==1.2.0 +importlib-metadata==1.5.0 +iso8601==0.1.12 +Jinja2==2.11.1 +jmespath==0.9.5 +jsonpatch==1.25 +jsonpointer==2.0 +jsonschema==3.2.0 +keystoneauth1==3.18.0 +linecache2==1.0.0 +MarkupSafe==1.1.1 +mccabe==0.2.1 +mock==2.0 +monotonic==1.5 +mox3==1.0.0 +msgpack==0.6.2 +munch==2.5.0 +netaddr==0.7.19 +netifaces==0.10.9 +nodeenv==0.9.4 +openstackdocstheme==1.20.0 +openstacksdk==0.43.0 +os-client-config==2.0.0 +os-service-types==1.7.0 +osc-lib==2.0.0 +oslo.concurrency==4.0.1 +oslo.config==8.0.1 +oslo.context==3.0.0 +oslo.i18n==4.0.0 +oslo.log==3.36.0 +oslo.policy==1.44.1 +oslo.serialization==2.18.0 +oslo.utils==3.34.0 +oslosphinx==4.7.0 +osprofiler==2.3.0 +packaging==20.3 +pbr==2.0.0 +pep8==1.5.7 +prettytable==0.7.2 +pycparser==2.20 +pyflakes==0.8.1 +Pygments==2.6.1 +pyinotify==0.9.6 +pymongo==3.10.1 +pyOpenSSL==19.1.0 +pyparsing==2.4.6 +pyperclip==1.7.0 +pyrsistent==0.15.7 +pyScss2==1.4.0 +python-cinderclient==6.0.0 +python-dateutil==2.8.1 +python-glanceclient==3.0.0 +python-keystoneclient==3.22.0 +python-mimeparse==1.6.0 +python-neutronclient==7.1.0 +python-novaclient==16.0.0 +python-swiftclient==3.9.0 +pytz==2019.3 +PyYAML==5.3.1 +rcssmin==1.0.6 +reno==1.8.0 +requests==2.23.0 +requestsexceptions==1.4.0 +rfc3986==1.3.2 +rjsmin==1.1.0 +selenium==2.50.1 +semantic-version==2.8.4 +simplejson==3.17.0 +six==1.14.0 +snowballstemmer==2.0.0 +Sphinx==1.6.2 +sphinxcontrib-applehelp==1.0.2 +sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-htmlhelp==1.0.3 +sphinxcontrib-jsmath==1.0.1 +sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-serializinghtml==1.1.4 +sqlparse==0.3.1 +stevedore==1.32.0 +testtools==1.4.0 +traceback2==1.4.0 +unittest2==1.1.0 +urllib3==1.25.8 +warlock==1.3.3 +wcwidth==0.1.8 +WebOb==1.8.6 +wrapt==1.12.1 +XStatic==1.0.2 +XStatic-Angular==1.5.8.0 +XStatic-Angular-Bootstrap==2.2.0.0 +XStatic-Angular-FileUpload==12.0.4.0 +XStatic-Angular-Gettext==2.3.8.0 +XStatic-Angular-lrdragndrop==1.0.2.4 +XStatic-Angular-Schema-Form==0.8.13.0 +XStatic-Bootstrap-Datepicker==1.3.1.0 +XStatic-Bootstrap-SCSS==3.3.7.1 +XStatic-bootswatch==3.3.7.0 +XStatic-D3==3.5.17.0 +XStatic-Font-Awesome==4.7.0.0 +XStatic-Hogan==2.0.0.2 +XStatic-Jasmine==2.4.1.2 +XStatic-jQuery==1.12.4.1 +XStatic-JQuery-Migrate==1.2.1.1 +XStatic-jquery-ui==1.12.1.1 +XStatic-JQuery.quicksearch==2.0.3.1 +XStatic-JQuery.TableSorter==2.14.5.1 +XStatic-JSEncrypt==2.3.1.1 +XStatic-mdi==1.6.50.2 +XStatic-objectpath==1.2.1.0 +XStatic-Rickshaw==1.5.0.0 +XStatic-roboto-fontface==0.5.0.0 +XStatic-smart-table==1.4.13.2 +XStatic-Spin==1.2.5.2 +XStatic-term.js==0.0.7.0 +XStatic-tv4==1.2.7.0 +xvfbwrapper==0.1.3 +zipp==3.1.0 diff --git a/setup.cfg b/setup.cfg index fb6915a..b5bd761 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,10 +14,9 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.4 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 [files] packages = diff --git a/test-requirements.txt b/test-requirements.txt index 89087e0..1e9308f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,13 +10,12 @@ hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0 coverage>=4.0 # Apache-2.0 mock>=2.0 # BSD -mox3!=0.19.0,>=0.7.0 # Apache-2.0 nodeenv>=0.9.4 # BSD oslosphinx>=4.7.0 # Apache-2.0 reno>=1.8.0 # Apache-2.0 selenium>=2.50.1 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD testtools>=1.4.0 # MIT # This also needs xvfb library installed on your OS xvfbwrapper>=0.1.3 #license: MIT -sphinx-rtd-theme>=0.2.4 +openstackdocstheme>=1.20.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 38787e3..0fc43e8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,11 @@ [tox] -envlist = py27,py27dj18,pep8,py35 -minversion = 1.6 +envlist = pep8,py37 +minversion = 3.1.1 skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 usedevelop = True setenv = VIRTUAL_ENV={envdir} NOSE_WITH_OPENSTACK=1 @@ -30,12 +32,6 @@ commands = coverage xml --omit '.tox/cover/*' -o 'cover/coverage.xml' coverage html --omit '.tox/cover/*' -d 'cover/htmlcov' -[testenv:py27dj18] -basepython = python2.7 -commands = - pip install django>=1.8,<1.9 - python manage.py test {posargs} - [testenv:eslint] whitelist_externals = npm commands = @@ -53,6 +49,12 @@ commands = [testenv:docs] commands = python setup.py build_sphinx +[testenv:lower-constraints] +deps = + -c{toxinidir}/lower-constraints.txt + -r{toxinidir}/test-requirements.txt + -r{toxinidir}/requirements.txt + [flake8] exclude = .venv,.git,.tox,dist,*lib/python*,*egg,build,panel_template,dash_template,local_settings.py,*/local/*,*/test/test_plugins/*,.ropeproject,node_modules # These are currently not passing, should be removed once code is changed