Skip to content

Commit

Permalink
Merge pull request #81 from HBS-HBX/pbaskovic/django-version-fix
Browse files Browse the repository at this point in the history
Update "Django>=1.8,<=2.2" to "Django>=1.8,<=3.1"
  • Loading branch information
esmail authored Mar 15, 2021
2 parents 9cb61d4 + f72a0da commit a484f73
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
8 changes: 0 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,6 @@ addons:

matrix:
include:
- env: TOX_ENV=py35-django110-es60 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
python: 3.5
- env: TOX_ENV=py35-django111-es60 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
python: 3.5
- env: TOX_ENV=py35-django20-es60 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
python: 3.5
- env: TOX_ENV=py35-django21-es60 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
python: 3.5
- env: TOX_ENV=py36-django110-es61 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
python: 3.6
- env: TOX_ENV=py36-django111-es61 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def get_version(*file_paths):
include_package_data=True,
install_requires=[
# TBD: GH issue #3 includes support for elasticsearch-dsl>=6.2.0
"Django>=1.8,<=2.2", "elasticsearch-dsl>=6.0.0,<6.2.0", "texttable>=1.2.1",
"Django>=1.8,<=3.1", "elasticsearch-dsl>=6.0.0,<6.2.0", "texttable>=1.2.1",
"multiprocessing-logging>=0.2.6"
],
zip_safe=False,
Expand Down

0 comments on commit a484f73

Please sign in to comment.