Browse Source

Merge "Update hacking for Python3"

tags/12.0.0.0rc1
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
496de07144
6 changed files with 13 additions and 15 deletions
  1. +0
    -4
      lower-constraints.txt
  2. +4
    -4
      sahara_dashboard/content/data_processing/clusters/clusters/workflows/create.py
  3. +4
    -4
      sahara_dashboard/content/data_processing/jobs/job_templates/workflows/launch.py
  4. +1
    -1
      sahara_dashboard/test/settings.py
  5. +1
    -1
      test-requirements.txt
  6. +3
    -1
      tox.ini

+ 0
- 4
lower-constraints.txt View File

@@ -23,10 +23,8 @@ eventlet==0.18.2
extras==1.0.0
fasteners==0.7.0
fixtures==3.0.0
flake8==2.5.5
futurist==1.2.0
greenlet==0.4.10
hacking==0.12.0
horizon==17.1.0
idna==2.6
iso8601==0.1.11
@@ -65,14 +63,12 @@ osprofiler==2.3.0
Paste==2.0.2
PasteDeploy==1.5.0
pbr==2.0.0
pep8==1.5.7
pika==0.10.0
pika-pool==0.1.3
Pint==0.5
positional==1.2.1
prettytable==0.7.2
pycparser==2.18
pyflakes==0.8.1
pyinotify==0.9.6
pymongo==3.0.2
pyOpenSSL==17.1.0


+ 4
- 4
sahara_dashboard/content/data_processing/clusters/clusters/workflows/create.py View File

@@ -70,10 +70,10 @@ class GeneralConfigAction(workflows.Action):
description = forms.CharField(label=_("Description"),
required=False,
widget=forms.Textarea(attrs={'rows': 4}))
cluster_template = forms.DynamicChoiceField(label=_("Cluster Template"),
initial=(None, "None"),
add_item_link=
TEMPLATE_UPLOAD_URL)
cluster_template = forms.DynamicChoiceField(
label=_("Cluster Template"),
initial=(None, "None"),
add_item_link=TEMPLATE_UPLOAD_URL)

cluster_count = forms.IntegerField(min_value=1,
label=_("Cluster Count"),


+ 4
- 4
sahara_dashboard/content/data_processing/jobs/job_templates/workflows/launch.py View File

@@ -289,10 +289,10 @@ class JobConfigAction(workflows.Action):
edp_configs[self.EDP_ADAPT_SPARK_SWIFT])
if (self.EDP_SUBST_DATASOURCE_NAME in edp_configs or
self.EDP_SUBST_DATASOURCE_UUID in edp_configs):
self.fields['datasource_substitute'].initial = (
edp_configs.get(self.EDP_SUBST_DATASOURCE_UUID, True)
or
edp_configs.get(self.EDP_SUBST_DATASOURCE_NAME, True))
self.fields['datasource_substitute'].initial = (
edp_configs.get(self.EDP_SUBST_DATASOURCE_UUID, True)
or
edp_configs.get(self.EDP_SUBST_DATASOURCE_NAME, True))

def clean(self):
cleaned_data = super(workflows.Action, self).clean()


+ 1
- 1
sahara_dashboard/test/settings.py View File

@@ -13,7 +13,7 @@
from horizon.test.settings import * # noqa
from openstack_dashboard.test.settings import * # noqa

INSTALLED_APPS = list(INSTALLED_APPS)
INSTALLED_APPS = list(INSTALLED_APPS) # noqa: F405
INSTALLED_APPS.append('sahara_dashboard.content.data_processing.clusters')
INSTALLED_APPS.append('sahara_dashboard.content.data_processing.jobs')
INSTALLED_APPS.append('sahara_dashboard.content.data_processing.data_plugins')

+ 1
- 1
test-requirements.txt View File

@@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.

hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
hacking>=3.0,<3.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
ddt>=1.0.1 # MIT
mock>=2.0.0 # BSD


+ 3
- 1
tox.ini View File

@@ -57,7 +57,9 @@ commands = oslo_debug_helper -t sahara_dashboard/test {posargs}
show-source = True
# E123, E125 skipped as they are invalid PEP-8.
# H405 multi line docstring summary not separated with an empty line
ignore = E123,E125,H405
# W503 line break before binary operator
# W504 line break after binary operator
ignore = E123,E125,H405,W503,W504
enable-extensions = H203,H106
builtins = _
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject,tools,.tmp


Loading…
Cancel
Save