Browse Source

update .gitignore and move to psycopg3 (now just psycopg)

Daniel Sheffield 3 years ago
parent
commit
5e5c797987
8 changed files with 21 additions and 12 deletions
  1. 10 0
      .gitignore
  2. 1 1
      app/price_view.py
  3. 1 1
      app/txn_view.py
  4. 2 2
      grocery_transactions.py
  5. 1 1
      mock.py
  6. 2 2
      price_check.py
  7. 2 2
      reconcile.py
  8. 2 3
      requirements.txt

+ 10 - 0
.gitignore

@@ -1,2 +1,12 @@
+# ignore python runtimes
 *.pyc
 __pycache__
+
+# ignore .txn files 
+*.txn
+
+# ignore secrets
+db_credentials.py
+
+# misc editor files
+.vscode

+ 1 - 1
app/price_view.py

@@ -4,7 +4,7 @@
 # All rights reserved
 #
 # THIS SOFTWARE IS PROVIDED AS IS WITHOUT WARRANTY
-from psycopg2.sql import (
+from psycopg.sql import (
     Identifier,
     SQL,
     Literal,

+ 1 - 1
app/txn_view.py

@@ -4,7 +4,7 @@
 # All rights reserved
 #
 # THIS SOFTWARE IS PROVIDED AS IS WITHOUT WARRANTY
-from psycopg2.sql import (
+from psycopg.sql import (
     Identifier,
     SQL,
     Literal,

+ 2 - 2
grocery_transactions.py

@@ -31,9 +31,9 @@ except:
 try:
     import os
 
-    import psycopg2
+    import psycopg
     user = os.getenv('USER')
-    conn: Cursor = psycopg2.connect(f"{host} dbname=das user={user} {password}")
+    conn: Cursor = psycopg.connect(f"{host} dbname=das user={user} {password}")
     cur = conn.cursor()
 except:
     print('Failed to set up db connection. Entering Mock mode')

+ 1 - 1
mock.py

@@ -5,7 +5,7 @@
 #
 # THIS SOFTWARE IS PROVIDED AS IS WITHOUT WARRANTY
 from faker import Faker
-from psycopg2.sql import SQL
+from psycopg.sql import SQL
 from datetime import datetime
 
 class mock_conn(object):

+ 2 - 2
price_check.py

@@ -28,9 +28,9 @@ except:
 try:
     import os
 
-    import psycopg2
+    import psycopg
     user = os.getenv('USER')
-    conn = psycopg2.connect(f"{host} dbname=das user={user} {password}")
+    conn = psycopg.connect(f"{host} dbname=das user={user} {password}")
     cur: Cursor = conn.cursor()
 except:
     print('Failed to set up db connection. Entering Mock mode')

+ 2 - 2
reconcile.py

@@ -14,7 +14,7 @@ import itertools
 import gnucash
 import sys
 import os
-import psycopg2
+import psycopg
 from app.db_utils import cursor_as_dict
 from app.txn_view import get_session_transactions_statement as get_statement
 
@@ -39,7 +39,7 @@ STORE_CODES = {
 }
 
 user = os.getenv('USER')
-conn = psycopg2.connect(f"{host} dbname=das user={user} {password}")
+conn = psycopg.connect(f"{host} dbname=das user={user} {password}")
 cur = conn.cursor()
 
 def get_record_from_database(date, store):

+ 2 - 3
requirements.txt

@@ -1,8 +1,7 @@
-#debian package libatlas3-base required on raspberrypi
-#debian package libpq-dev required for psycopg2
+#numpy: debian package libatlas3-base required on raspberrypi
 additional-urwid-widgets
 urwid
-psycopg2
+psycopg
 faker
 pandas
 numpy