]>
Commit | Line | Data |
---|---|---|
c29bd224 JR |
1 | diff -urNp -x '*.orig' SQLAlchemy-1.3.23.org/setup.py SQLAlchemy-1.3.23/setup.py |
2 | --- SQLAlchemy-1.3.23.org/setup.py 2021-02-01 21:52:02.000000000 +0100 | |
3 | +++ SQLAlchemy-1.3.23/setup.py 2021-03-07 23:28:59.044650527 +0100 | |
4 | @@ -89,7 +89,7 @@ class PyTest(TestCommand): | |
0b211bb2 | 5 | # not working at the time of this comment. |
c29bd224 | 6 | user_options = [("pytest-args=", "a", "Arguments to pass to py.test")] |
0b211bb2 JB |
7 | |
8 | - default_options = ["-n", "4", "-q", "--nomemory"] | |
9 | + default_options = ["-q", "--nomemory"] | |
10 | ||
11 | def initialize_options(self): | |
12 | TestCommand.initialize_options(self) | |
c29bd224 | 13 | @@ -159,7 +159,7 @@ def run_setup(with_cext): |
0b211bb2 | 14 | cmdclass=cmdclass, |
be381d2c JB |
15 | tests_require=[ |
16 | "pytest>=2.5.2,!=3.9.1,!=3.9.2", | |
17 | - "mock", | |
18 | + "mock;python_version<'3.3'", | |
19 | "pytest-xdist", | |
20 | ], | |
0b211bb2 | 21 | long_description=readme, |
cbac615f JR |
22 | --- SQLAlchemy-1.3.23/test/dialect/mssql/test_engine.py~ 2021-02-01 21:52:02.000000000 +0100 |
23 | +++ SQLAlchemy-1.3.23/test/dialect/mssql/test_engine.py 2021-11-28 20:02:55.581556369 +0100 | |
24 | @@ -158,26 +158,6 @@ | |
25 | True, | |
26 | ) | |
27 | ||
28 | - def test_pyodbc_extra_connect_azure(self): | |
29 | - # issue #5592 | |
30 | - dialect = pyodbc.dialect() | |
31 | - u = url.make_url( | |
32 | - "mssql+pyodbc://@server_name/db_name?" | |
33 | - "driver=ODBC+Driver+17+for+SQL+Server;" | |
34 | - "authentication=ActiveDirectoryIntegrated" | |
35 | - ) | |
36 | - connection = dialect.create_connect_args(u) | |
37 | - eq_(connection[1], {}) | |
38 | - eq_( | |
39 | - connection[0][0] | |
40 | - in ( | |
41 | - "DRIVER={ODBC Driver 17 for SQL Server};" | |
42 | - "Server=server_name;Database=db_name;" | |
43 | - "Authentication=ActiveDirectoryIntegrated", | |
44 | - ), | |
45 | - True, | |
46 | - ) | |
47 | - | |
48 | def test_pyodbc_odbc_connect(self): | |
49 | dialect = pyodbc.dialect() | |
50 | u = url.make_url( |