Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #56: Support for Django 3. Added envs in travis for python 3.7, 3.8 #57

Merged
merged 4 commits into from Aug 4, 2020

Conversation

stgraham2000
Copy link

  • Updated setup.py to allow django 3 while still excluding versions referenced in: GHSA-hmr4-m2h5-33qx
  • Added py3.7 and py3.8 support to .travis.yml
  • Django 3 took out the need for python_2_unicode_compatible as can be seen in other large django packages. Lef as a version switch for backwards compatibility.
  • Django 3 changed the signature of from_db_value and removed the context parameter as a positional arg. The old code never used it anyhow so this change should work and is also the recommended change from looking at other Django packages

Ran through all the tests manually for each python environment and everything passed.

Steve Graham added 2 commits August 4, 2020 11:43
…i for python 3.7 and 3.8

* Updated setup.py to allow django 3 while still excluding versions referenced in: GHSA-hmr4-m2h5-33qx
* Added py3.7 and py3.8 support to .travis.yml
* Django 3 took out the need for python_2_unicode_compatible as can be seen in other large django packages.  Lef as a version switch for backwards compatibility.
* Django 3 changed the signature of from_db_value and removed the context parameter as a positional arg.  The old code never used it anyhow so this change should work and is also the recommended change from looking at other Django packages

Ran through all the tests manually for each python environment and everything passed.
@coveralls
Copy link

coveralls commented Aug 4, 2020

Coverage Status

Coverage increased (+0.06%) to 90.64% when pulling 65eb0e0 on stgraham2000:master into effeb38 on dimagi:master.

setup.py Outdated
# https://github.com/advisories/GHSA-hmr4-m2h5-33qx
'django>=1.11.28,!=2.0.*,!=2.1.*,!=2.2.0,!=2.2.1,!=2.2.2,!=2.2.3,!=2.2.4,!=2.2.5,!=2.2.6,!=2.2.7,!=2.2.8,!=2.2.9,<3',
'django>=1.11.28,!=2.0.*,!=2.1.*,!=2.2.0,!=2.2.1,!=2.2.2,!=2.2.3,!=2.2.4,!=2.2.5,!=2.2.6,!=2.2.7,!=2.2.8,!=2.2.9,!=3.0.0,!=3.0.1,!=3.0.2',
Copy link
Member

Choose a reason for hiding this comment

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

I think we'll still need a <4 here so that when it comes out in the future, it's not retroactively considered a valid version (until we support it).

Copy link
Author

Choose a reason for hiding this comment

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

Agreed.

Copy link
Contributor

@millerdev millerdev left a comment

Choose a reason for hiding this comment

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

@stgraham2000 Thank you for the contribution!

Please remove Pipfile and Pipfile.lock from this PR. They may be added a separate PR with an explanation of why they are important if you think they are an improvement.

* Removed Pipfile and Pipfile.lock that were accidentally added in a previous commit
* Changed setup.py to restrict untested major versions of Django
Copy link
Contributor

@millerdev millerdev left a comment

Choose a reason for hiding this comment

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

Thanks for the update.

@stgraham2000
Copy link
Author

Thanks Daniel. Oops about the Pipfile.* checkins. They slipped in during one of my 2 commits to fix the build.

@millerdev millerdev merged commit f94c946 into dimagi:master Aug 4, 2020
@millerdev
Copy link
Contributor

@stgraham2000 version 1.0.0, which includes this change-set has been uploaded to pypi, fyi

@stgraham2000
Copy link
Author

stgraham2000 commented Aug 5, 2020 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants