From 4393b0227a0f44dc07cf66723f8ea276663a80e2 Mon Sep 17 00:00:00 2001 From: Glenn De Jonghe Date: Wed, 9 Jun 2021 17:54:17 +0200 Subject: [PATCH] update packages --- .github/workflows/black.yml | 2 +- .github/workflows/pythonpackage.yml | 3 ++- fireant/__init__.py | 11 +++++++++++ requirements-dev.txt | 6 +++--- requirements-extras-snowflake.txt | 2 +- requirements-extras-vertica.txt | 2 +- requirements.txt | 6 +++--- tox.ini | 3 +-- 8 files changed, 23 insertions(+), 12 deletions(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 2bb36a07..ef8a3514 100644 --- a/.github/workflows/black.yml +++ b/.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 diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 31d2577d..fadb45cc 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.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" diff --git a/fireant/__init__.py b/fireant/__init__.py index fb1072cf..e99ab1ef 100644 --- a/fireant/__init__.py +++ b/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" diff --git a/requirements-dev.txt b/requirements-dev.txt index e4a7adcb..cc70944c 100644 --- a/requirements-dev.txt +++ b/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 diff --git a/requirements-extras-snowflake.txt b/requirements-extras-snowflake.txt index de382716..54d36ab5 100644 --- a/requirements-extras-snowflake.txt +++ b/requirements-extras-snowflake.txt @@ -1 +1 @@ -snowflake-connector-python==2.3.7 +snowflake-connector-python==2.4.4 diff --git a/requirements-extras-vertica.txt b/requirements-extras-vertica.txt index 78a8a1ac..11d7c42a 100644 --- a/requirements-extras-vertica.txt +++ b/requirements-extras-vertica.txt @@ -1 +1 @@ -vertica-python==1.0.0 +vertica-python==1.0.1 diff --git a/requirements.txt b/requirements.txt index 7636a3c9..8a846af7 100644 --- a/requirements.txt +++ b/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 diff --git a/tox.ini b/tox.ini index 9a6f03d8..0dfb1196 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py36,py37,py38 +envlist = py37,py38 [testenv] deps = -r requirements-dev.txt commands = @@ -7,6 +7,5 @@ commands = coverage xml [gh-actions] python = - 3.6: py36 3.7: py37 3.8: py38