openstack
/
tempest-horizon
Code Issues Proposed changes

Cleanup python 2.7 support 

* Remove six usage
* Remove python 2.7 stanza from setup.py
* Update supported python versions in setup.cfg
* Remove i18n related sections in setup.cfg
  as tempest-horizon has no translation support
* Remove unused requirements (oslo_log and babel) from requirements.txt

Change-Id: Ifd530546bfb5ae25e01e72a0e3c02f963d9d04d2
This commit is contained in:
Akihiro Motoki 2020-04-01 15:07:33 +09:00
parent 84adbf3adb
commit 48bde4d38f
4 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
requirements.txt
View File

@ -3,8 +3,5 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0 pbr!=2.1.0,>=2.0.0 # Apache-2.0
Babel!=2.4.0,>=2.3.4 # BSD
oslo.config>=4.6.0 # Apache-2.0 oslo.config>=4.6.0 # Apache-2.0
oslo.log>=3.30.0 # Apache-2.0
six>=1.10.0 # MIT
tempest>=17.1.0 # Apache-2.0 tempest>=17.1.0 # Apache-2.0

23
setup.cfg
View File

@ -5,7 +5,7 @@ description-file =
README.rst README.rst
author = OpenStack author = OpenStack
author-email = openstack-discuss@lists.openstack.org author-email = openstack-discuss@lists.openstack.org
home-page = http://www.openstack.org/ home-page = https://opendev.org/openstack/tempest-horizon
classifier = classifier =
Environment :: OpenStack Environment :: OpenStack
Intended Audience :: Information Technology Intended Audience :: Information Technology
@ -13,29 +13,14 @@ classifier =
License :: OSI Approved :: Apache Software License License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux Operating System :: POSIX :: Linux
Programming Language :: Python Programming Language :: Python
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.3 Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.7
[files] [files]
packages = packages =
tempest_horizon tempest_horizon
[entry_points] [entry_points]
tempest.test_plugins = tempest.test_plugins =
horizon = tempest_horizon.plugin:HorizonTempestPlugin horizon = tempest_horizon.plugin:HorizonTempestPlugin
[compile_catalog]
directory = tempest_horizon/locale
domain = tempest_horizon
[update_catalog]
domain = tempest_horizon
output_dir = tempest_horizon/locale
input_file = tempest_horizon/locale/tempest_horizon.pot
[extract_messages]
keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg
output_file = tempest_horizon/locale/tempest_horizon.pot

9
setup.py
View File

@ -13,17 +13,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools 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( setuptools.setup(
setup_requires=['pbr>=2.0.0'], setup_requires=['pbr>=2.0.0'],
pbr=True) pbr=True)

8
tempest_horizon/tests/scenario/test_dashboard_basic_ops.py
View File

@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from six.moves import html_parser as HTMLParser import html.parser
from six.moves.urllib import parse from urllib import parse
from six.moves.urllib import request from urllib import request
from tempest import config from tempest import config
from tempest.lib import decorators from tempest.lib import decorators
@ -25,7 +25,7 @@ import ssl
CONF = config.CONF CONF = config.CONF
class HorizonHTMLParser(HTMLParser.HTMLParser): class HorizonHTMLParser(html.parser.HTMLParser):
csrf_token = None csrf_token = None
region = None region = None
login = None login = None