Skip to content

Commit 274b0fb

Browse files
committed
WIP trying to update test env
adding to python path doesn't seem to work
1 parent 8ce77cd commit 274b0fb

File tree

3 files changed

+27
-25
lines changed

3 files changed

+27
-25
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
language: python
22
python:
3-
- '3.6'
43
- '3.7'
54
- '3.8'
5+
- '3.9'
6+
- '3.10'
67
install:
78
- pip install tox tox-travis
89
script:

dev-requirements.txt

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ requests
44
freezegun
55

66
# PyTest for running the tests.
7-
pytest==5.2.1
8-
pytest-django==3.5.1
9-
pytest-cov==2.8.1
10-
pytest-pythonpath
7+
pytest==7.3.1
8+
pytest-django==4.5.2
9+
pytest-cov==4.0.0

tox.ini

+22-20
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
[pytest]
2-
python_paths = ./tests
3-
changedir = ./tests
2+
changedir = tests
3+
pythonpath = . tests
44
DJANGO_SETTINGS_MODULE = django_minio_storage_tests.settings
55
addopts=--tb=short
66
python_files = tests.py test_*.py *_tests.py
7+
django_find_project = false
78

89
[travis]
910
python =
10-
3.6: py36
1111
3.7: py37
12-
3.8: py38, lint, docs
12+
3.8: py38
13+
3.9: py39
14+
3.10: py310, lint, docs
1315

1416
[travis:env]
1517
DJANGO =
16-
1.11: django111
17-
2.1: django21
18-
2.2: django22, lint, docs
19-
3.0: django30
18+
2.2: django22
19+
3.2: django32, lint, docs
20+
4.0: django40
2021

2122
[testenv]
2223
commands = pytest {posargs}
@@ -27,22 +28,23 @@ setenv =
2728
MINIO_STORAGE_SECRET_KEY=weak_secret_key
2829
TOX_ENVNAME={envname}
2930
deps =
30-
django111: Django==1.11.*
31+
3132
django21: Django==2.1.*
3233
django22: Django==2.2.*
33-
django30: Django==3.0b1
34+
django32: Django==3.2.*
35+
django40: Django==4.0.*
3436
minio: minio
35-
minioknown: minio==4.0.21
37+
minioknown: minio==6.0.2
3638
-rdev-requirements.txt
3739

3840
[testenv:lint]
3941
setenv=
4042
PYTHONWARNINGS=ignore
4143
basepython = python3
4244
deps =
43-
flake8==3.8.3
44-
isort==5.4.2
45-
black==20.8b1
45+
flake8==4.0.1
46+
isort==5.10.1
47+
black==22.3.0
4648
commands =
4749
flake8 --config .flake8rc
4850
isort --check --diff .
@@ -54,9 +56,9 @@ setenv=
5456
basepython = python3
5557
deps =
5658
pyupgrade-directories
57-
flake8==3.8.3
58-
isort==5.4.2
59-
black==20.8b1
59+
flake8==4.0.1
60+
isort==5.10.1
61+
black==22.3.0
6062
commands =
6163
pyup_dirs --exit-zero-even-if-changed --py36-plus minio_storage tests
6264
isort .
@@ -69,8 +71,8 @@ commands = mkdocs build
6971

7072
[tox]
7173
envlist =
72-
{py36,py37,py38}-django22-minioknown
73-
py38-django{111,21,30}-minioknown
74-
py38-django22-minio
74+
{py37,py38,py39,py310}-django32-minioknown
75+
py310-django{111,21,30}-minioknown
76+
py310-django32-minio
7577
lint
7678
docs

0 commit comments

Comments
 (0)