Skip to content

Commit 8b07928

Browse files
gmonkmangmonkman
committed
mainly outlier analysis
1 parent 4c7b571 commit 8b07928

24 files changed

Lines changed: 444 additions & 234 deletions

‎dblib/alchemylib.py‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ def _get_mssql_prefix(db_type=MSSQLODBCDriver.mssqlserver2012):
6464
return 'SQL Server Native Client 10.0'
6565
elif db_type == MSSQLODBCDriver.mssqlserver2012:
6666
return 'SQL Server Native Client 11.0'
67-
else:
68-
return 'SQL Server'
67+
68+
return 'SQL Server'
6969

7070
def mssql_connection_string(self, driver=MSSQLODBCDriver.mssqlserver2012):
7171
'''connection_string getter for _create_engine'''
@@ -160,16 +160,16 @@ def sql_upsert(table, keylist, **kwargs):
160160
sql_update.append(", ".join(update))
161161
sql_update.append(" WHERE %s" % (" AND ".join(where)))
162162
return "".join(sql_update)
163-
else:
164-
keys = ["%s" % k for k in allargs]
165-
values = ["'%s'" % v for v in allargs.values()]
166-
sql_insert = list()
167-
sql_insert.append("INSERT INTO %s (" % table)
168-
sql_insert.append(", ".join(keys))
169-
sql_insert.append(") VALUES (")
170-
sql_insert.append(", ".join(values))
171-
sql_insert.append(");")
172-
return "".join(sql_insert)
163+
164+
keys = ["%s" % k for k in allargs]
165+
values = ["'%s'" % v for v in allargs.values()]
166+
sql_insert = list()
167+
sql_insert.append("INSERT INTO %s (" % table)
168+
sql_insert.append(", ".join(keys))
169+
sql_insert.append(") VALUES (")
170+
sql_insert.append(", ".join(values))
171+
sql_insert.append(");")
172+
return "".join(sql_insert)
173173

174174

175175
def create_engine_mssql(cnstr, echo=False, poolclass=_pool.NullPool):
@@ -183,15 +183,16 @@ def create_engine_mssql(cnstr, echo=False, poolclass=_pool.NullPool):
183183

184184
def close():
185185
'''close up db stuff'''
186-
with fuckit:
186+
try:
187187
ENGINE.dispose()
188+
except Exception as _:
189+
pass
188190

189191

190192
def main():
191193
'''entry for test code'''
192194
cnn = ConnectionString('toshiba', 'imagedb', 'sa', 'GGM290471')
193-
s = cnn.mssql_connection_string(MSSQLODBCDriver.mssqlserver2012)
194-
pass
195+
_ = cnn.mssql_connection_string(MSSQLODBCDriver.mssqlserver2012)
195196

196197

197198
# This only executes if this script was the entry point

‎dblib/dblib.pyproj‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<SchemaVersion>2.0</SchemaVersion>
66
<ProjectGuid>357f2f6c-b6bf-4bb9-b3a3-e6b0130467a2</ProjectGuid>
77
<ProjectHome>.</ProjectHome>
8-
<StartupFile>alchemylib.py</StartupFile>
8+
<StartupFile>test\test_mssql.py</StartupFile>
99
<SearchPath>..\</SearchPath>
1010
<WorkingDirectory>.</WorkingDirectory>
1111
<OutputPath>.</OutputPath>
1212
<Name>dblib</Name>
1313
<RootNamespace>dblib</RootNamespace>
1414
<IsWindowsApplication>False</IsWindowsApplication>
15-
<InterpreterId>{09cee27f-142a-45c4-8575-1838255879f0}</InterpreterId>
15+
<InterpreterId>{9a7a9026-48c1-4688-9d5d-e5699d47d074}</InterpreterId>
1616
<InterpreterVersion>3.5</InterpreterVersion>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -25,9 +25,11 @@
2525
</PropertyGroup>
2626
<ItemGroup>
2727
<Compile Include="alchemylib.py" />
28+
<Compile Include="mssql.py" />
2829
<Compile Include="sqlitelib.py">
2930
<SubType>Code</SubType>
3031
</Compile>
32+
<Compile Include="test\test_mssql.py" />
3133
<Compile Include="__init__.py">
3234
<SubType>Code</SubType>
3335
</Compile>
@@ -36,20 +38,10 @@
3638
<Content Include="pylintrc" />
3739
</ItemGroup>
3840
<ItemGroup>
39-
<Interpreter Include="env\">
40-
<Id>{09cee27f-142a-45c4-8575-1838255879f0}</Id>
41-
<BaseInterpreter>{9a7a9026-48c1-4688-9d5d-e5699d47d074}</BaseInterpreter>
42-
<Version>3.5</Version>
43-
<Description>env (Python 64-bit 3.5)</Description>
44-
<InterpreterPath>Scripts\python.exe</InterpreterPath>
45-
<WindowsInterpreterPath>Scripts\pythonw.exe</WindowsInterpreterPath>
46-
<LibraryPath>Lib\</LibraryPath>
47-
<PathEnvironmentVariable>PYTHONPATH</PathEnvironmentVariable>
48-
<Architecture>Amd64</Architecture>
49-
</Interpreter>
41+
<Folder Include="test\" />
5042
</ItemGroup>
5143
<ItemGroup>
52-
<Folder Include="test\" />
44+
<InterpreterReference Include="{9a7a9026-48c1-4688-9d5d-e5699d47d074}\3.5" />
5345
</ItemGroup>
5446
<PropertyGroup>
5547
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

‎dblib/pylintrc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ confidence=
6060
# --enable=similarities". If you want to run only the classes checker, but have
6161
# no Warning level messages displayed, use"--disable=all --enable=classes
6262
# --disable=W"
63-
disable=line-too-long,lost-exceptiontoo-few-public-methods,too-many-arguments,too-many-branches,too-many-instance-attributes,too-many-locals,too-many-nested-block,too-many-statements,ungrouped-imports,wrong-import-order,apply-builtin,backtick,bad-continuation,basestring-builtin,buffer-builtin,cmp-builtin,cmp-method,coerce-builtin,coerce-method,delslice-method,dict-iter-method,dict-view-method,execfile-builtin,file-builtin,filter-builtin-not-iterating,getslice-method,hex-method,I0011,import-star-module-level,indexing-exception,input-builtin,intern-builtin,line-too-long,locally-disabled,long-builtin,long-suffix,map-builtin-not-iterating,metaclass-assignment,multiple-statements,next-method-called,no-absolute-import,nonzero-method,oct-method,old-division,old-ne-operator,old-octal-literal,old-raise-syntax,parameter-unpacking,print-statement,raising-string,range-builtin-not-iterating,raw_input-builtin,reduce-builtin,relative-import,reload-builtin,round-builtin,setslice-method,standarderror-builtin,suppressed-message,too-few-public-methods,too-many-arguments,too-many-boolean-expressions,too-many-branches,too-many-locals,trailing-whitespace,unichr-builtin,unicode-builtin,using-cmp-argument,xrange-builtin,not-context-manager,file-ignored,inconsistent-return-statements
63+
disable=line-too-long,lost-exceptiontoo-few-public-methods,too-many-arguments,too-many-branches,too-many-instance-attributes,too-many-locals,too-many-nested-block,too-many-statements,ungrouped-imports,wrong-import-order,apply-builtin,backtick,bad-continuation,basestring-builtin,buffer-builtin,cmp-builtin,cmp-method,coerce-builtin,coerce-method,delslice-method,dict-iter-method,dict-view-method,execfile-builtin,file-builtin,filter-builtin-not-iterating,getslice-method,hex-method,I0011,import-star-module-level,indexing-exception,input-builtin,intern-builtin,line-too-long,locally-disabled,long-builtin,long-suffix,map-builtin-not-iterating,metaclass-assignment,multiple-statements,next-method-called,no-absolute-import,nonzero-method,oct-method,old-division,old-ne-operator,old-octal-literal,old-raise-syntax,parameter-unpacking,print-statement,raising-string,range-builtin-not-iterating,raw_input-builtin,reduce-builtin,relative-import,reload-builtin,round-builtin,setslice-method,standarderror-builtin,suppressed-message,too-few-public-methods,too-many-arguments,too-many-boolean-expressions,too-many-branches,too-many-locals,trailing-whitespace,unichr-builtin,unicode-builtin,using-cmp-argument,xrange-builtin,file-ignored,bare-except,pointless-statement,too-many-function-args,broad-except,invalid-name,keyword-arg-before-vararg
6464

6565

6666
[REPORTS]
@@ -96,7 +96,7 @@ evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / stateme
9696
bad-functions=map,filter,input
9797

9898
# Good variable names which should always be accepted, separated by a comma
99-
good-names=i,j,k,ex,Run,_,a,b,c,d,e,f,g,h,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z
99+
good-names=i,j,k,ex,Run,_,a,b,c,d,e,f,g,h,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,nd,df
100100

101101
# Bad variable names which should always be refused, separated by a comma
102102
bad-names=foo,bar,baz,toto,tutu,tata
@@ -231,7 +231,7 @@ notes=FIXME,XXX,TODO
231231
[SIMILARITIES]
232232

233233
# Minimum lines number of a similarity.
234-
min-similarity-lines=4
234+
min-similarity-lines=20
235235

236236
# Ignore comments when computing similarities.
237237
ignore-comments=yes
@@ -269,7 +269,8 @@ ignore-mixin-members=yes
269269
# (useful for modules/projects where namespaces are manipulated during runtime
270270
# and thus existing member attributes cannot be deduced by static analysis. It
271271
# supports qualified module names, as well as Unix pattern matching.
272-
ignored-modules=numpy,numpy.random,pandas.np,pandas.np.random
272+
#ignored-modules=numpy,numpy.random,pandas.np,pandas.np.random
273+
ignored-modules=
273274

274275
# List of classes names for which member attributes should not be checked
275276
# (useful for classes with attributes dynamically set). This supports can work

0 commit comments

Comments
 (0)