Skip to content

Commit 9c8bfcb

Browse files
authored
Merge pull request #163 from dcrosta/readthedocs-yaml
add a .readthedocs.yaml
2 parents a541d88 + b76da77 commit 9c8bfcb

File tree

5 files changed

+37
-26
lines changed

5 files changed

+37
-26
lines changed

.readthedocs.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
build:
3+
os: ubuntu-22.04
4+
tools:
5+
python: "3.11"
6+
sphinx:
7+
configuration: docs/conf.py
8+
python:
9+
install:
10+
- requirements: docs/requirements.txt

azure-pipelines.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ jobs:
1717
vmImage: 'ubuntu-latest'
1818
strategy:
1919
matrix:
20-
Python37:
21-
python.version: '3.7'
2220
Python38:
2321
python.version: '3.8'
2422
Python39:
2523
python.version: '3.9'
24+
Python310:
25+
python.version: '3.10'
26+
Python311:
27+
python.version: '3.11'
2628
maxParallel: 4
2729

2830
steps:

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ versions.
6565

6666
Flask-PyMongo is tested against `supported versions
6767
<https://www.mongodb.com/support-policy>`_ of MongoDB, and Python
68-
and 3.6+. For the exact list of version combinations that are tested and
68+
and 3.8+. For the exact list of version combinations that are tested and
6969
known to be compatible, see the `envlist` in `tox.ini
7070
<https://github.com/dcrosta/flask-pymongo/blob/master/tox.ini>`_.
7171

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
platforms="any",
3131
packages=find_packages(),
3232
install_requires=[
33-
"Flask>=0.12",
34-
"PyMongo>=3.3",
33+
"Flask>=1.0",
34+
"PyMongo>=3.11",
3535
"six",
3636
],
3737
classifiers=[

tox.ini

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
11
[tox]
22

3-
; keep the pymongo list in sync with what's in .travis.yaml
3+
; pymongo{311,312,40,41,42,43}-mongo{4x,5x,6x}-flask{10,11,2x}, style
44
envlist=
5-
pymongo{37,38,39,310,311,312}-mongo{40,42,44,50}-flask{10,11,20}, style
5+
pymongo{311,312}-mongo{4x,5x,6x}-flask{10,11,2x}, style
66

77
[testenv]
88
docker =
9-
mongo40: mongo40
10-
mongo42: mongo42
11-
mongo44: mongo44
12-
mongo50: mongo50
9+
mongo4x: mongo4x
10+
mongo5x: mongo5x
11+
mongo6x: mongo6x
1312

1413
deps =
1514
pytest
15+
markupsafe<2.1
1616

17-
pymongo37: pymongo>=3.7,<3.8
18-
pymongo38: pymongo>=3.8,<3.9
19-
pymongo39: pymongo>=3.9,<3.10
20-
pymongo310: pymongo>=3.10,<3.11
2117
pymongo311: pymongo>=3.11,<3.12
2218
pymongo312: pymongo>=3.12,<3.13
19+
pymongo40: pymongo>=4.0,<4.1
20+
pymongo41: pymongo>=4.1,<4.2
21+
pymongo42: pymongo>=4.2,<4.3
22+
pymongo43: pymongo>=4.3,<4.4
2323

2424
flask10: flask>=1.0,<1.1
25+
flask10: jinja2<3.0
26+
flask10: itsdangerous<2.1.0
2527
flask11: flask>=1.1,<1.2
26-
flask20: flask>=2.0,<2.1
28+
flask2x: flask>=2.0,<3.0
2729

2830
commands =
2931
{envbindir}/py.test --tb=native {toxinidir}
@@ -32,7 +34,7 @@ commands =
3234
skipsdist = true
3335
skip_install = true
3436
deps =
35-
flake8
37+
flake8<6
3638
flake8-quotes
3739
flake8-commas
3840
https://github.com/dcrosta/flake8-import-order/archive/add-fromsfirst-style.tar.gz#egg=flake8-import-order
@@ -50,14 +52,11 @@ ignore = D100,D104,D107
5052
exclude =
5153
_version.py
5254

53-
[docker:mongo40]
54-
image = mongo:4.0
55+
[docker:mongo4x]
56+
image = mongo:4
5557

56-
[docker:mongo42]
57-
image = mongo:4.2
58+
[docker:mongo5x]
59+
image = mongo:5
5860

59-
[docker:mongo44]
60-
image = mongo:4.4
61-
62-
[docker:mongo50]
63-
image = mongo:5.0
61+
[docker:mongo6x]
62+
image = mongo:6

0 commit comments

Comments
 (0)