Changeset b889b6a in sasmodels

Timestamp:

Mar 21, 2019 11:37:57 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

c11d09f

Parents:

069743a (diff), df20715 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'lint' of github.com:sasview/sasmodels into lint

Files:

• extra/pylint.rc (modified) (4 diffs)
• sasmodels/kernelcl.py (modified) (1 diff)

extra/pylint.rc

@@ -69 +69 @@
     #no-else-return,
     #invalid-name,
-    #fixme,
-    #too-many-lines,
-    #too-many-locals,
-    #too-many-branches,
-    #too-many-statements,
+    fixme,
+    too-many-lines,
+    too-many-locals,
+    too-many-branches,
+    too-many-statements,
     #too-many-instance-attributes,
     #too-many-return-statements,
@@ -119 +119 @@
 good-names=_,
     input, id,
-    h, i, j, k, n, p, u, v, w, x, y, z,
-    q, qx, qy, qz, Q, Qx, Qy, Qz,
-    dt, dx, dy, dz, dq,
+    h, i, j, k, n, p, u, v, w, x, y, z, r, dr,
+    q, qx, qy, qz, Q, Qx, Qy, Qz, nx, ny, nz, nq, nr,
+    dt, dx, dy, dz, dq, S, P, a, b, c,
     Iq, dIq, Iqxy, Iq_calc,
     ER, call_ER, VR, call_VR,
@@ -143 +143 @@
 
 # Regular expression matching correct variable names
-variable-rgx=[a-z_][a-z0-9_{2D}{1D}]{2,30}$
+variable-rgx=[a-z_][a-z0-9_{2D}{1D}]{1,30}$
 
 # Naming hint for variable names
@@ -161 +161 @@
 
 # Regular expression matching correct argument names
-argument-rgx=[a-z_][a-z0-9_]{2,30}$
+argument-rgx=[a-z_][a-z0-9_]{1,30}$
 
 # Naming hint for argument names

sasmodels/kernelcl.py

@@ -329 +329 @@
             return [cl.create_some_context(interactive=False)]
         except Exception as exc:
-            # TODO: Should warnings instead by put into logging.warn?
+            # TODO: Should warnings instead be put into logging.warn?
             warnings.warn(str(exc))
             warnings.warn(