Browse Source

Merge "Upgrade pylint to a version that works with python3"

Zuul 3 months ago
parent
commit
fdec45b953

+ 3
- 0
.pylintrc View File

@@ -44,13 +44,16 @@ disable=
44 44
 # "C" Coding convention violations
45 45
  bad-continuation,
46 46
  invalid-name,
47
+ len-as-condition,
47 48
  missing-docstring,
48 49
  superfluous-parens,
49 50
 # "R" Refactor recommendations
50 51
  abstract-class-little-used,
51 52
  abstract-class-not-used,
52 53
  duplicate-code,
54
+ inconsistent-return-statements,
53 55
  interface-not-implemented,
56
+ no-else-return,
54 57
  no-self-use,
55 58
  too-few-public-methods,
56 59
  too-many-ancestors,

+ 3
- 2
doc/source/samples/bgpvpn-sample01.py View File

@@ -13,11 +13,12 @@
13 13
 #    License for the specific language governing permissions and limitations
14 14
 #    under the License.
15 15
 
16
+import os
17
+import sys
18
+
16 19
 from keystoneauth1.identity import v3
17 20
 from keystoneauth1 import session
18 21
 from neutronclient.v2_0 import client
19
-import os
20
-import sys
21 22
 
22 23
 # Parameter for subnet neutron object
23 24
 SUBNET_IP = "192.168.24.0/24"

+ 2
- 2
lower-constraints.txt View File

@@ -3,7 +3,7 @@ alembic==0.8.10
3 3
 amqp==2.1.1
4 4
 appdirs==1.3.0
5 5
 asn1crypto==0.23.0
6
-astroid==1.3.8
6
+astroid==1.6.5
7 7
 Babel==2.3.4
8 8
 beautifulsoup4==4.6.0
9 9
 blockdiag==1.5.3
@@ -111,7 +111,7 @@ pycparser==2.18
111 111
 pyflakes==0.8.1
112 112
 Pygments==2.2.0
113 113
 pyinotify==0.9.6
114
-pylint==1.4.5
114
+pylint==1.9.2
115 115
 pymongo==3.0.2
116 116
 PyMySQL==0.7.6
117 117
 pyOpenSSL==17.1.0

+ 1
- 1
networking_bgpvpn/neutron/services/common/constants.py View File

@@ -19,7 +19,7 @@ BGPVPN_RES = bgpvpn.BGPVPN_RES
19 19
 BGPVPN_L3 = bgpvpn.BGPVPN_L3
20 20
 BGPVPN_L2 = bgpvpn.BGPVPN_L2
21 21
 BGPVPN_TYPES = bgpvpn.BGPVPN_TYPES
22
-UINT32_REGEX, = bgpvpn.UINT32_REGEX,
22
+UINT32_REGEX = bgpvpn.UINT32_REGEX
23 23
 UINT16_REGEX = bgpvpn.UINT16_REGEX
24 24
 UINT8_REGEX = bgpvpn.UINT8_REGEX
25 25
 IP4_REGEX = bgpvpn.IP4_REGEX

+ 2
- 1
networking_bgpvpn/neutron/services/service_drivers/bagpipe/bagpipe_v2.py View File

@@ -28,6 +28,8 @@ from neutron_lib.db import api as db_api
28 28
 from neutron_lib import exceptions as n_exc
29 29
 from neutron_lib.plugins import directory
30 30
 
31
+from networking_bagpipe.objects import bgpvpn as bgpvpn_objects
32
+
31 33
 from oslo_log import helpers as log_helpers
32 34
 from oslo_log import log as logging
33 35
 
@@ -35,7 +37,6 @@ from networking_bgpvpn.neutron.extensions import bgpvpn as bgpvpn_ext
35 37
 from networking_bgpvpn.neutron.services.common import utils
36 38
 from networking_bgpvpn.neutron.services.service_drivers import driver_api
37 39
 
38
-from networking_bagpipe.objects import bgpvpn as bgpvpn_objects
39 40
 
40 41
 LOG = logging.getLogger(__name__)
41 42
 

+ 0
- 3
networking_bgpvpn/neutron/services/service_drivers/driver_api.py View File

@@ -306,9 +306,6 @@ class BGPVPNDriverRCBase(BGPVPNDriverBase):
306 306
     more_supported_extension_aliases = [
307 307
         bgpvpn_rc.Bgpvpn_routes_control.get_alias()]
308 308
 
309
-    def __init__(self, *args, **kwargs):
310
-        super(BGPVPNDriverRCBase, self).__init__(*args, **kwargs)
311
-
312 309
     @abc.abstractmethod
313 310
     def update_router_assoc(self, context, assoc_id, router_association):
314 311
         pass

+ 1
- 1
test-requirements.txt View File

@@ -14,7 +14,7 @@ stestr>=1.0.0 # Apache-2.0
14 14
 testresources>=2.0.0 # Apache-2.0/BSD
15 15
 testscenarios>=0.4 # Apache-2.0/BSD
16 16
 testtools>=2.2.0 # MIT
17
-pylint==1.4.5 # GPLv2
17
+pylint==1.9.2 # GPLv2
18 18
 tempest>=17.1.0 # Apache-2.0
19 19
 
20 20
 # OpenStack CI will install the following projects from git

+ 1
- 0
tox.ini View File

@@ -24,6 +24,7 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/re
24 24
 commands = sphinx-build -W -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
25 25
 
26 26
 [testenv:pep8]
27
+basepython = python3
27 28
 deps =
28 29
     {[testenv]deps}
29 30
 commands =

Loading…
Cancel
Save