Skip to content

Commit dec7126

Browse files
committed
Update to SQLAlchemy 1.3.17
1 parent 7e987a4 commit dec7126

File tree

4 files changed

+38
-13
lines changed

4 files changed

+38
-13
lines changed

dev-requirements.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
# generated dev-requirements.txt), run make update-requirements,
55
# then re-run bootstrap.sh.
66

7-
flake8==3.8.1
8-
tox==3.15.1
7+
flake8==3.8.3
8+
tox==3.15.2
99
# Twine is used in the release process to upload the package.
1010
twine==3.1.1
1111
## The following requirements were added by pip freeze:
1212
appdirs==1.4.4
1313
bleach==3.1.5
14-
certifi==2020.4.5.1
14+
certifi==2020.4.5.2
1515
chardet==3.0.4
1616
distlib==0.3.0
1717
docutils==0.16
1818
filelock==3.0.12
1919
idna==2.9
20-
importlib-metadata==1.6.0
20+
importlib-metadata==1.6.1
2121
keyring==21.2.1
2222
mccabe==0.6.1
2323
packaging==20.4
@@ -31,9 +31,9 @@ pyparsing==2.4.7
3131
readme-renderer==26.0
3232
requests==2.23.0
3333
requests-toolbelt==0.9.1
34-
six==1.14.0
34+
six==1.15.0
3535
toml==0.10.1
36-
tqdm==4.46.0
36+
tqdm==4.46.1
3737
urllib3==1.25.9
3838
virtualenv==20.0.21
3939
webencodings==0.5.1

test-requirements.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@
44
# To add/update dependencies, update test-requirements.txt.in (not the
55
# generated test-requirements.txt) and run make update-requirements
66

7-
SQLAlchemy==1.2.10
7+
SQLAlchemy==1.3.17
88
more-itertools==8.3.0
99
mock==4.0.2
10-
pytest==3.7.1
10+
pytest==5.4.3
1111
futures==3.1.1
1212
psycopg2==2.8.5
1313
## The following requirements were added by pip freeze:
14-
atomicwrites==1.4.0
1514
attrs==19.3.0
16-
importlib-metadata==1.6.0
15+
importlib-metadata==1.6.1
16+
packaging==20.4
1717
pluggy==0.13.1
1818
py==1.8.1
19-
six==1.14.0
19+
pyparsing==2.4.7
20+
six==1.15.0
21+
wcwidth==0.2.4
2022
zipp==3.1.0

test-requirements.txt.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# To add/update dependencies, update test-requirements.txt.in (not the
55
# generated test-requirements.txt) and run make update-requirements
66

7-
SQLAlchemy==1.2.10 # the last known version of SQLAlchemy that passes all tests.
7+
SQLAlchemy==1.3.17 # the last known version of SQLAlchemy that passes all tests.
88
more-itertools
99
mock
10-
pytest==3.7.1
10+
pytest
1111
futures
1212
psycopg2

test/sqlalchemy/test_suite.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,24 @@
1+
import pytest
2+
13
from sqlalchemy.testing.suite import * # noqa
4+
from sqlalchemy.testing.suite import (
5+
ComponentReflectionTest as _ComponentReflectionTest
6+
)
7+
from sqlalchemy.testing.suite import (
8+
ExpandingBoundInTest as _ExpandingBoundInTest
9+
)
10+
11+
12+
class ComponentReflectionTest(_ComponentReflectionTest):
13+
@pytest.mark.skip()
14+
def test_deprecated_get_primary_keys(self):
15+
# This is removed in the next sqlalchemy release (1.3.18)
16+
pass
17+
18+
19+
class ExpandingBoundInTest(_ExpandingBoundInTest):
20+
@pytest.mark.skip()
21+
def test_null_in_empty_set_is_false(self, connection):
22+
# Fixed in https://github.com/cockroachdb/cockroach/pull/49814
23+
# Unskip when backported.
24+
pass

0 commit comments

Comments
 (0)