From c452206146cc69e84dd7bb1e4e506fed845b27f1 Mon Sep 17 00:00:00 2001 From: Artom Lifshitz Date: Sun, 3 May 2020 11:27:46 -0400 Subject: [PATCH] Update hacking for Python 3 In change I3f4216f66606fbc450a46c93de306399b7f3cd65 [1], tempest updated their use of hacking for Python 3. Among other things, this removed tempest.hacking.checks.factory, which we consumed. Update our use of hacking to keep pace, and un-break the gate. [1] I3f4216f66606fbc450a46c93de306399b7f3cd65 Change-Id: Ia4e0b3cca8cb984900b49804b964d03ea6466191 --- test-requirements.txt | 2 +- tox.ini | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 9f79dc23..fe70434c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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;python_version>='3.5' # Apache-2.0 mock oslotest stestr<=2.6.0;python_version=='2.7' # MIT diff --git a/tox.ini b/tox.ini index 7de44491..2aa18742 100644 --- a/tox.ini +++ b/tox.ini @@ -31,10 +31,25 @@ commands = flake8 {posargs} [flake8] -ignore = H405 +ignore = H405,W504 enable-extensions = H106,H203,H904 show-source = True exclude = .git,.venv,.tox,dist,doc,*egg -[hacking] -local-check-factory = tempest.hacking.checks.factory +[flake8:local-plugins] +extension = + T102 = tempest.hacking.checks:import_no_clients_in_api_and_scenario_tests + T104 = tempest.hacking.checks:scenario_tests_need_service_tags + T105 = tempest.hacking.checks:no_setup_teardown_class_for_tests + T107 = tempest.hacking.checks:service_tags_not_in_module_path + T108 = tempest.hacking.checks:no_hyphen_at_end_of_rand_name + N322 = tempest.hacking.checks:no_mutable_default_args + T109 = tempest.hacking.checks:no_testtools_skip_decorator + T110 = tempest.hacking.checks:get_resources_on_service_clients + T111 = tempest.hacking.checks:delete_resources_on_service_clients + T112 = tempest.hacking.checks:dont_import_local_tempest_into_lib + T113 = tempest.hacking.checks:use_rand_uuid_instead_of_uuid4 + T114 = tempest.hacking.checks:dont_use_config_in_tempest_lib + T115 = tempest.hacking.checks:dont_put_admin_tests_on_nonadmin_path + T116 = tempest.hacking.checks:unsupported_exception_attribute_PY3 + T117 = tempest.hacking.checks:negative_test_attribute_always_applied_to_negative_tests