Merge pull request #362 from gl3nn/update-packages

Update packages and remove python 3.6 from github actions

.github/workflows/black.yml

@@ -8,4 +8,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-      - uses: psf/black@21.5b1
+      - uses: psf/black@21.5b2

.github/workflows/pythonpackage.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.7, 3.8]
 
     steps:
       - uses: actions/checkout@v1
@@ -25,6 +25,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
+          pip install wheel
           pip install cython
           pip install -r requirements-dev.txt
           pip install "coveralls<3.0.0"

fireant/__init__.py

@@ -44,4 +44,15 @@
 from .exceptions import DataSetException
 from .widgets import *
 
+from pypika.terms import Term
+
+
+# Monkey patching PyPika's Term class to use the old hash functionality
+def __hash__(self) -> int:
+    return hash(self.get_sql(with_alias=True))
+
+
+Term.__hash__ = __hash__
+
+
 __version__ = "7.8.6"

requirements-dev.txt

@@ -8,9 +8,9 @@
 -r requirements-extras-ipython.txt
 
 # Testing / CI
-tox==3.14.3
+tox==3.23.1
 tox-venv==0.4.0
-tox-gh-actions==0.3.0
+tox-gh-actions==2.5.0
 coverage==5.1
 
 # Utilities
@@ -22,4 +22,4 @@ sphinx==2.2.0
 sphinx-rtd-theme==0.4.3
 
 # Formatting
-black==21.5b1
+black==21.5b2

requirements-extras-snowflake.txt

@@ -1 +1 @@
-snowflake-connector-python==2.3.7
+snowflake-connector-python==2.4.4

requirements-extras-vertica.txt

@@ -1 +1 @@
-vertica-python==1.0.0
+vertica-python==1.0.1

requirements.txt

@@ -1,4 +1,4 @@
-pandas==1.1.1
-pypika==0.48.1
-toposort==1.5
+pandas==1.1.5
+pypika==0.48.2
+toposort==1.6
 python-dateutil==2.8.1

tox.ini

@@ -1,12 +1,11 @@
 [tox]
-envlist = py36,py37,py38
+envlist = py37,py38
 [testenv]
 deps = -r requirements-dev.txt
 commands =
     coverage run
     coverage xml
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37
     3.8: py38