Skip to content

Commit a70bf2c

Browse files
barseghyanarturbarseghyanartur
committed
Django 3.0 support. Tested against Python 3.8
1 parent 9d5e862 commit a70bf2c

File tree

12 files changed

+98
-11
lines changed

12 files changed

+98
-11
lines changed

‎.travis.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ matrix:
1616
python: 3.6
1717
- env: TOX_ENV=py37-mg35-django111
1818
python: 3.7
19+
- env: TOX_ENV=py38-mg35-django111
20+
python: 3.8
1921

2022
- env: TOX_ENV=py27-mg3x-django111
2123
python: 2.7
@@ -25,41 +27,71 @@ matrix:
2527
python: 3.6
2628
- env: TOX_ENV=py37-mg3x-django111
2729
python: 3.7
30+
- env: TOX_ENV=py38-mg3x-django111
31+
python: 3.8
2832

2933
- env: TOX_ENV=py35-mg35-django20
3034
python: 3.5
3135
- env: TOX_ENV=py36-mg35-django20
3236
python: 3.6
3337
- env: TOX_ENV=py37-mg35-django20
3438
python: 3.7
39+
- env: TOX_ENV=py38-mg35-django20
40+
python: 3.8
3541

3642
- env: TOX_ENV=py35-mg3x-django20
3743
python: 3.5
3844
- env: TOX_ENV=py36-mg3x-django20
3945
python: 3.6
4046
- env: TOX_ENV=py37-mg3x-django20
4147
python: 3.7
48+
- env: TOX_ENV=py38-mg3x-django20
49+
python: 3.8
4250

4351
- env: TOX_ENV=py35-mg35-django21
4452
python: 3.5
4553
- env: TOX_ENV=py36-mg35-django21
4654
python: 3.6
4755
- env: TOX_ENV=py37-mg35-django21
4856
python: 3.7
57+
- env: TOX_ENV=py38-mg35-django21
58+
python: 3.8
4959

5060
- env: TOX_ENV=py35-mg3x-django22
5161
python: 3.5
5262
- env: TOX_ENV=py36-mg3x-django22
5363
python: 3.6
5464
- env: TOX_ENV=py37-mg3x-django22
5565
python: 3.7
66+
- env: TOX_ENV=py38-mg3x-django22
67+
python: 3.8
5668

5769
- env: TOX_ENV=py35-mg3x-django22
5870
python: 3.5
5971
- env: TOX_ENV=py36-mg3x-django21
6072
python: 3.6
6173
- env: TOX_ENV=py37-mg3x-django22
6274
python: 3.7
75+
- env: TOX_ENV=py38-mg3x-django22
76+
python: 3.8
77+
78+
- env: TOX_ENV=py35-mg3x-django30
79+
python: 3.5
80+
- env: TOX_ENV=py36-mg3x-django30
81+
python: 3.6
82+
- env: TOX_ENV=py37-mg3x-django30
83+
python: 3.7
84+
- env: TOX_ENV=py38-mg3x-django30
85+
python: 3.8
86+
87+
- env: TOX_ENV=py35-mg3x-django30
88+
python: 3.5
89+
- env: TOX_ENV=py36-mg3x-django30
90+
python: 3.6
91+
- env: TOX_ENV=py37-mg3x-django30
92+
python: 3.7
93+
- env: TOX_ENV=py38-mg3x-django30
94+
python: 3.8
6395

6496
before_script:
6597
- sleep 15

‎CHANGELOG.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ are used for versioning (schema follows below):
1515
0.3.4 to 0.4).
1616
- All backwards incompatible changes are mentioned in this document.
1717

18+
0.3.5
19+
-----
20+
2020-03-23
21+
22+
- Tested against Python 3.8.
23+
- Tested against Django 3.0.
24+
1825
0.3.4
1926
-----
2027
2019-04-04

‎LICENSE_GPL2.0.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ the "copyright" line and a pointer to where the full notice is found.
292292

293293
django-mongoengine-filter - `django-filter` for MongoEngine.
294294

295-
Copyright (C) 2019 Artur Barseghyan
295+
Copyright (C) 2019-2020 Artur Barseghyan
296296

297297
This program is free software; you can redistribute it and/or modify
298298
it under the terms of the GNU General Public License as published by

‎LICENSE_LGPL_2.1.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ convey the exclusion of warranty; and each file should have at least the
472472

473473
django-mongoengine-filter - `django-filter` for MongoEngine.
474474

475-
Copyright (C) 2019 Artur Barseghyan
475+
Copyright (C) 2019-2020 Artur Barseghyan
476476

477477
This library is free software; you can redistribute it and/or
478478
modify it under the terms of the GNU Lesser General Public

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Full documentation on `Read the docs`_.
3030

3131
Requirements
3232
============
33-
* Python 2.7, 3.5, 3.6, 3.7
34-
* Django 1.11, 2.0, 2.1, 2.2
33+
* Python 2.7, 3.5, 3.6, 3.7, 3.8
34+
* Django 1.11, 2.0, 2.1, 2.2, 3.0
3535

3636
Installation
3737
============

‎django_mongoengine_filter/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
from .filterset import FilterSet
44
from .filters import *
55

6-
VERSION = (0, 3, 4)
6+
VERSION = (0, 3, 5)
77

88
__title__ = "django-mongoengine-filter"
99
__version__ = ".".join([str(_i) for _i in VERSION])
1010
__author__ = "Artur Barseghyan <artur.barseghyan@gmail.com>"
11-
__copyright__ = "2019 Artur Barseghyan"
11+
__copyright__ = "2019-2020 Artur Barseghyan"
1212
__license__ = "GPL 2.0/LGPL 2.1"

‎django_mongoengine_filter/filters.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55

66

77
from django import forms
8-
from django.utils import six
98
from django.utils.timezone import now
109
from django.utils.translation import ugettext_lazy as _
1110

11+
import six
12+
1213
from .fields import RangeField, LookupTypeField, Lookup
1314

1415
try:

‎django_mongoengine_filter/filterset.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
from django.core.validators import EMPTY_VALUES
99
from django.db import models
1010
from django.db.models.constants import LOOKUP_SEP
11-
from django.utils import six
1211
from django.utils.text import capfirst
1312
from django.utils.translation import ugettext as _
1413

1514
import mongoengine
1615
from mongoengine.errors import LookUpError
1716
from mongoengine.fields import EmbeddedDocumentField, ListField
1817

18+
import six
19+
1920
from .filters import (
2021
Filter,
2122
StringFilter,

‎requirements/django_3_0.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-r common.txt
2+
-r debug.txt
3+
-r test.txt
4+
#-r code_style.txt
5+
6+
Django>=3.0,<3.1
7+

‎setup.py‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,24 @@
44
readme = f.read()
55
f.close()
66

7+
install_requires = [
8+
'six>=1.9',
9+
]
10+
11+
extras_require = []
12+
13+
tests_require = [
14+
'factory_boy',
15+
'fake-factory',
16+
'pytest',
17+
'pytest-django',
18+
'pytest-cov',
19+
'tox',
20+
]
21+
722
setup(
823
name="django-mongoengine-filter",
9-
version="0.3.4",
24+
version="0.3.5",
1025
description=(
1126
"django-mongoengine-filter is a reusable Django application inspired "
1227
"from django-filter for allowing mongoengine users to filter querysets "
@@ -16,6 +31,15 @@
1631
author="Artur Barseghyhan",
1732
author_email="artur.barseghyan@gmail.com",
1833
url="https://github.com/barseghyanartur/django-mongoengine-filter",
34+
project_urls={
35+
"Bug Tracker": "https://github.com/barseghyanartur/"
36+
"django-mongoengine-filter/issues",
37+
"Documentation": "https://django-mongoengine-filter.readthedocs.io/",
38+
"Source Code": "https://github.com/barseghyanartur/"
39+
"django-mongoengine-filter",
40+
"Changelog": "https://django-mongoengine-filter.readthedocs.io/"
41+
"en/latest/changelog.html",
42+
},
1943
packages=find_packages(exclude=["tests"]),
2044
package_data={"django_mongoengine_filter": ["locale/*/LC_MESSAGES/*"]},
2145
license="GPL-2.0-only OR LGPL-2.1-or-later",
@@ -32,8 +56,12 @@
3256
"Programming Language :: Python :: 3.5",
3357
"Programming Language :: Python :: 3.6",
3458
"Programming Language :: Python :: 3.7",
59+
"Programming Language :: Python :: 3.8",
3560
"Framework :: Django",
3661
],
62+
python_requires=">=2.7",
63+
install_requires=(install_requires + extras_require),
64+
tests_require=tests_require,
3765
include_package_data=True,
3866
zip_safe=False,
3967
)

0 commit comments

Comments
 (0)