Skip to content
This repository has been archived by the owner on May 19, 2020. It is now read-only.

[requirements] Added Django 3 support, upgraded dependencies #90

Merged
merged 1 commit into from
Jan 22, 2020
Merged

[requirements] Added Django 3 support, upgraded dependencies #90

merged 1 commit into from
Jan 22, 2020

Conversation

pawelplsi
Copy link
Contributor

@pawelplsi pawelplsi commented Jan 21, 2020 •
edited

Dropped Python 2 and Django<2.2 #79
Closes #79

nemesifier
nemesifier reviewed Jan 21, 2020
View reviewed changes
Copy link
Member

@nemesifier nemesifier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pawelplsi shorten the commit message please, it's too long

nemesifier
nemesifier reviewed Jan 21, 2020
View reviewed changes
Copy link
Member

@nemesifier nemesifier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove python 3.5 and remove the if TRAVIS_PYTHON_VERSION == 3.5

.travis.yml Outdated
@@ -14,6 +14,8 @@ branches:
- master

env:
- DJANGO="django>=2.2,<3.0"
- DJANGO="django>=3.0,<3.3"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a blank line after that line

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's not longer relevant, please see how it is now

@pawelplsi pawelplsi force-pushed the deps-update branch 2 times, most recently from 06a5760 to 5ece370 Compare January 21, 2020 13:25
@coveralls
Copy link

coveralls commented Jan 21, 2020 •
edited

Pull Request Test Coverage Report for Build 344

  • 12 of 12 (100.0%) changed or added relevant lines in 2 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 100.0%
Totals Coverage Status
Change from base Build 315: 0.0%
Covered Lines: 491
Relevant Lines: 491
💛 - Coveralls

@pawelplsi pawelplsi force-pushed the deps-update branch 3 times, most recently from b1030a3 to 6851eb3 Compare January 21, 2020 13:48
@pawelplsi pawelplsi marked this pull request as ready for review January 21, 2020 13:48
@pawelplsi pawelplsi changed the title [requirements] Added Django 3 support, upgraded dependencies, dropped Python 2 and Django<2.2 #79 [requirements] Added Django 3 support, upgraded dependencies Jan 21, 2020
@pawelplsi
Copy link
Contributor Author

Ofc, I checked the admin subpages (including export/import views) and spotted no error in console 😄

atb00ker
atb00ker reviewed Jan 21, 2020
View reviewed changes
requirements.txt Outdated Show resolved Hide resolved
nemesifier
nemesifier suggested changes Jan 21, 2020
View reviewed changes
Copy link
Member

@nemesifier nemesifier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there, please implement these minor corrections

requirements.txt Outdated Show resolved Hide resolved
requirements.txt Outdated Show resolved Hide resolved
atb00ker
atb00ker reviewed Jan 21, 2020
View reviewed changes
Copy link
Member

@atb00ker atb00ker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also see some from __future__ import unicode_literals, we don't need them now! 😄

@pawelplsi pawelplsi force-pushed the deps-update branch 2 times, most recently from 7ead0d5 to 51808e7 Compare January 21, 2020 16:26
nemesifier
nemesifier suggested changes Jan 21, 2020
View reviewed changes
.travis.yml Outdated

before_install:
- pip install --no-cache-dir -U -r requirements-test.txt
- npm install -g jslint
- jslint ./django_ipam/static/django-ipam/js/*.js

install:
- pip install "django>=2.0,<2.3"
- pip install $DJANGO
- python setup.py -q develop

script:
- >
openwisp-utils-qa-checks --migration-path "./django_ipam/migrations/ ./tests/sample_ipam/migrations/"
--skip-checkmakemigrations
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you either should remove --skip-checkmakemigrations or you should not remove the check below (just remove the if, not the check).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I'll correct that, but could you tell me why was that check executed previously only for one build, that with python 3.5? I don't get it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because 2.7 on travis had some issue if I recall correctly! 😄

@pawelplsi
Copy link
Contributor Author

@nemesisdesign The if is then actually needed there but only without python version check since the migration tests will fail with DEMO_APP

@nemesifier
Copy link
Member

@nemesisdesign The if is then actually needed there but only without python version check since the migration tests will fail with DEMO_APP

Yes correct, thanks!

@nemesifier nemesifier merged commit 757879f into openwisp:master Jan 22, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@atb00ker atb00ker atb00ker left review comments

@nemesifier nemesifier nemesifier approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[requirements] Update dependencies
4 participants
@pawelplsi @coveralls @nemesifier @atb00ker