Skip to content

Commit 158a357

Browse files
authored
Merge pull request kayak#362 from gl3nn/update-packages
Update packages and remove python 3.6 from github actions
2 parents fd987eb + 4393b02 commit 158a357

File tree

8 files changed

+23
-12
lines changed

8 files changed

+23
-12
lines changed

.github/workflows/black.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ jobs:
88
steps:
99
- uses: actions/checkout@v2
1010
- uses: actions/setup-python@v2
11-
- uses: psf/black@21.5b1
11+
- uses: psf/black@21.5b2

.github/workflows/pythonpackage.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
max-parallel: 4
1515
matrix:
16-
python-version: [3.6, 3.7, 3.8]
16+
python-version: [3.7, 3.8]
1717

1818
steps:
1919
- uses: actions/checkout@v1
@@ -25,6 +25,7 @@ jobs:
2525
- name: Install dependencies
2626
run: |
2727
python -m pip install --upgrade pip
28+
pip install wheel
2829
pip install cython
2930
pip install -r requirements-dev.txt
3031
pip install "coveralls<3.0.0"

fireant/__init__.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,15 @@
4444
from .exceptions import DataSetException
4545
from .widgets import *
4646

47+
from pypika.terms import Term
48+
49+
50+
# Monkey patching PyPika's Term class to use the old hash functionality
51+
def __hash__(self) -> int:
52+
return hash(self.get_sql(with_alias=True))
53+
54+
55+
Term.__hash__ = __hash__
56+
57+
4758
__version__ = "7.8.6"

requirements-dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
-r requirements-extras-ipython.txt
99

1010
# Testing / CI
11-
tox==3.14.3
11+
tox==3.23.1
1212
tox-venv==0.4.0
13-
tox-gh-actions==0.3.0
13+
tox-gh-actions==2.5.0
1414
coverage==5.1
1515

1616
# Utilities
@@ -22,4 +22,4 @@ sphinx==2.2.0
2222
sphinx-rtd-theme==0.4.3
2323

2424
# Formatting
25-
black==21.5b1
25+
black==21.5b2

requirements-extras-snowflake.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
snowflake-connector-python==2.3.7
1+
snowflake-connector-python==2.4.4

requirements-extras-vertica.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
vertica-python==1.0.0
1+
vertica-python==1.0.1

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pandas==1.1.1
2-
pypika==0.48.1
3-
toposort==1.5
1+
pandas==1.1.5
2+
pypika==0.48.2
3+
toposort==1.6
44
python-dateutil==2.8.1

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
[tox]
2-
envlist = py36,py37,py38
2+
envlist = py37,py38
33
[testenv]
44
deps = -r requirements-dev.txt
55
commands =
66
coverage run
77
coverage xml
88
[gh-actions]
99
python =
10-
3.6: py36
1110
3.7: py37
1211
3.8: py38

0 commit comments

Comments
 (0)