Commit 89b1f64f authored by Hamaker, Alec's avatar Hamaker, Alec
Browse files

resolved merge conflict

parents c2344284 1ccc8dab

README.md

+1 −2
Original line number Diff line number Diff line
@@ -7,10 +7,9 @@ Everything is configurable with environmental variables. 


### Installation via pip



Run this command to install version 0.1.10 via pip:

Run this command to install version 0.1.11 (latest) via pip:



`python3 -m pip --no-cache-dir install common==0.1.2 --index-url https://code.ornl.gov/api/v4/projects/10568/packages/pypi/simple  --trusted-host code.ornl.gov`



This will install latest (not recommended):



`python3 -m pip --no-cache-dir install common --index-url https://code.ornl.gov/api/v4/projects/10568/packages/pypi/simple  --trusted-host code.ornl.gov`

src/common/mixins/mssql.py

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 


import pymssql

import traceback

import logging





class MSSQLMixin():

    """Provides a convenient API-like interface to Microsoft SQL databases.