Changeset b889b6a in sasmodels


Ignore:
Timestamp:
Mar 21, 2019 11:37:57 AM (2 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • extra/pylint.rc

    r4e28511 rdf20715  
    6969    #no-else-return, 
    7070    #invalid-name, 
    71     #fixme, 
    72     #too-many-lines, 
    73     #too-many-locals, 
    74     #too-many-branches, 
    75     #too-many-statements, 
     71    fixme, 
     72    too-many-lines, 
     73    too-many-locals, 
     74    too-many-branches, 
     75    too-many-statements, 
    7676    #too-many-instance-attributes, 
    7777    #too-many-return-statements, 
     
    119119good-names=_, 
    120120    input, id, 
    121     h, i, j, k, n, p, u, v, w, x, y, z, 
    122     q, qx, qy, qz, Q, Qx, Qy, Qz, 
    123     dt, dx, dy, dz, dq, 
     121    h, i, j, k, n, p, u, v, w, x, y, z, r, dr, 
     122    q, qx, qy, qz, Q, Qx, Qy, Qz, nx, ny, nz, nq, nr, 
     123    dt, dx, dy, dz, dq, S, P, a, b, c, 
    124124    Iq, dIq, Iqxy, Iq_calc, 
    125125    ER, call_ER, VR, call_VR, 
     
    143143 
    144144# Regular expression matching correct variable names 
    145 variable-rgx=[a-z_][a-z0-9_{2D}{1D}]{2,30}$ 
     145variable-rgx=[a-z_][a-z0-9_{2D}{1D}]{1,30}$ 
    146146 
    147147# Naming hint for variable names 
     
    161161 
    162162# Regular expression matching correct argument names 
    163 argument-rgx=[a-z_][a-z0-9_]{2,30}$ 
     163argument-rgx=[a-z_][a-z0-9_]{1,30}$ 
    164164 
    165165# Naming hint for argument names 
  • sasmodels/kernelcl.py

    r4e28511 r069743a  
    329329            return [cl.create_some_context(interactive=False)] 
    330330        except Exception as exc: 
    331             # TODO: Should warnings instead by put into logging.warn? 
     331            # TODO: Should warnings instead be put into logging.warn? 
    332332            warnings.warn(str(exc)) 
    333333            warnings.warn( 
Note: See TracChangeset for help on using the changeset viewer.