Skip to content

Commit 309f166

Browse files
committed
Run tests against pyscopg3 for Django 4.2
1 parent b428fda commit 309f166

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

.circleci/config.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@ commands:
3232
parameters:
3333
pyversion:
3434
type: integer
35-
djversions:
36-
type: string
3735

3836
steps:
3937
- run:
4038
name: Run tests
41-
command: tox -e 'py<< parameters.pyversion >>-dj{<< parameters.djversions >>}'
39+
command: tox --listenvs | grep ^py<< parameters.pyversion >> | circleci tests split | xargs -n 1 tox -e
4240
environment:
4341
DATABASE_URL: 'postgres://psqlextra:psqlextra@localhost:5432/psqlextra'
4442

@@ -53,7 +51,6 @@ jobs:
5351
extra: test
5452
- run-tests:
5553
pyversion: 36
56-
djversions: 20,21,22,30,31,32
5754

5855
test-python37:
5956
executor:
@@ -65,7 +62,6 @@ jobs:
6562
extra: test
6663
- run-tests:
6764
pyversion: 37
68-
djversions: 20,21,22,30,31,32
6965

7066
test-python38:
7167
executor:
@@ -77,7 +73,6 @@ jobs:
7773
extra: test
7874
- run-tests:
7975
pyversion: 38
80-
djversions: 20,21,22,30,31,32,40,41,42
8176

8277
test-python39:
8378
executor:
@@ -89,7 +84,6 @@ jobs:
8984
extra: test
9085
- run-tests:
9186
pyversion: 39
92-
djversions: 21,22,30,31,32,40,41,42
9387

9488
test-python310:
9589
executor:
@@ -101,7 +95,6 @@ jobs:
10195
extra: test
10296
- run-tests:
10397
pyversion: 310
104-
djversions: 21,22,30,31,32,40,41,42
10598
- store_test_results:
10699
path: reports
107100
- run:

setup.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,6 @@ def run(self):
9595
"build==0.7.0",
9696
"twine==3.7.1",
9797
],
98-
"psycopg3": [
99-
"django>=4.2,<5.0",
100-
"psycopg[binary]>=3.0.0",
101-
],
10298
},
10399
cmdclass={
104100
"lint": create_command(

tox.ini

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
[tox]
2-
envlist = py36-dj{20,21,22,30,31,32}, py37-dj{20,21,22,30,31,32}, py38-dj{20,21,22,30,31,32,40,41,42}, py39-dj{21,22,30,31,32,40,41,42}, py310-dj{21,22,30,31,32,40,41,42}
2+
envlist =
3+
{py36,py37}-dj{20,21,22,30,31,32}-psycopg{2}
4+
{py38,py39,py310}-dj{20,21,22,30,31,32,40,41}-psycopg{2}
5+
{py38,py39,py310}-dj{42}-psycopg{2,3}
36

47
[testenv]
58
deps =
@@ -11,7 +14,9 @@ deps =
1114
dj32: Django~=3.2.0
1215
dj40: Django~=4.0.0
1316
dj41: Django~=4.1.0
14-
dj42: .[psycopg3]
17+
dj42: Django~=4.2.0
18+
psycopg2: psycopg2[binary]~=2.9
19+
psycopg3: psycopg[binary]~=3.1
1520
.[test]
1621
setenv =
1722
DJANGO_SETTINGS_MODULE=settings

0 commit comments

Comments
 (0)