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

Django 3.0 Compatibility Patch #136

Merged
merged 21 commits into from Feb 7, 2020
Merged

Django 3.0 Compatibility Patch #136

merged 21 commits into from Feb 7, 2020

Conversation

fsecada01
Copy link
Contributor

Added Six module to replicate django-utils-encoding functionality.

@fsecada01 fsecada01 mentioned this pull request Dec 26, 2019
@coveralls
Copy link

Coverage Status

Coverage increased (+0.9%) to 64.195% when pulling 621ab15 on fsecada01:master into 3ff9f46 on bee-keeper:master.

@Siecje
Copy link

Siecje commented Jan 7, 2020

This needs six in install_requires in setup.py.

Or just remove six since it seems Python2 is not supported.
#134

setup.py Outdated Show resolved Hide resolved
@fsecada01
Copy link
Contributor Author

Issue found: django-allauth updated to v 0.41.0, which removed Django 1.11+ functionality. Pinned v. 0.40.0 for testing in tox.ini file.

README.md Outdated Show resolved Hide resolved
tox.ini Show resolved Hide resolved
Neglected to omit a line about working on a test branch.  Removed.
invitations/models.py Outdated Show resolved Hide resolved
tox.ini Outdated Show resolved Hide resolved
invitations/utils.py Outdated Show resolved Hide resolved
requirements.txt Outdated Show resolved Hide resolved
@fsecada01

This comment has been minimized.

@Siecje
Copy link

Siecje commented Feb 5, 2020

url is now re_path. https://docs.djangoproject.com/en/3.0/releases/2.0/#simplified-url-routing-syntax

@fsecada01
Copy link
Contributor Author

Travis seems to be stuck on the main repo's testing page, but on my fork, it looks like it passed!

https://travis-ci.org/fsecada01/django-invitations/builds/646591964?utm_medium=notification&utm_source=github_status

@bee-keeper bee-keeper changed the base branch from master to devel February 7, 2020 17:04
@bee-keeper bee-keeper merged commit c1ecbde into jazzband:devel Feb 7, 2020
bee-keeper added a commit that referenced this pull request Feb 7, 2020
* Django 3.0 Compatibility Patch (#136)

* Added six module for python_2_unicode_compatible functionality. Should be compatible with Django 3.0

* Added six module for python_2_unicode_compatible functionality. Should be compatible with Django 3.0

* Patch; fixed utils.py by removing django.utils and referencing the six module directly

* Added Six to install_requires arg in setup.py

* Edits to tox. Errors with BackendAllauth may still be present

* removed six; removed Python2 compatibility due to EOL/Code Freeze

* removed six from install_requires

* removed six from install_requires

* Travis CI Integration

* PUSH ISSUE | MAKING SLIGHT CHANGE TO FIX COMMIT ISSUE try-except clause for django.conf.urls/django.urls due to v1.11 limitations

* PUSH ISSUE | MAKING SLIGHT CHANGE TO FIX COMMIT ISSUE try-except clause for django.conf.urls/django.urls due to v1.11 limitations

* removing cache keys from travis to check against errors

* pinned django-allauth version to 0.40.0 due to Dec update ditching Django v!+.  Pushing to test.

* Fixed malformed tox.ini setting for django-allauth version pin.

* Update README

Neglected to omit a line about working on a test branch.  Removed.

* Removed six + Django 1.11 support, per @bee-keeper's request

* Removed django.conf.urls conditional import now that Django 1.11 support is being dropped

* re-added conditional url imports at test_urls; removed six from requirements

* fixed Django3 version error in tox.ini; removed conditional import of url and replaced with re_path

* fixed tox error w/Python3.5 by removing Django v.3.0 from testing; Django 3 is only compatible with Python 3.6 onward.

* continue to test against 1.x

* tox

Co-authored-by: Francis Secada <francis.secada@gmail.com>
ralphqq pushed a commit to kirubakaran/django-invitations that referenced this pull request Aug 23, 2022
* Django 3.0 Compatibility Patch (jazzband#136)

* Added six module for python_2_unicode_compatible functionality. Should be compatible with Django 3.0

* Added six module for python_2_unicode_compatible functionality. Should be compatible with Django 3.0

* Patch; fixed utils.py by removing django.utils and referencing the six module directly

* Added Six to install_requires arg in setup.py

* Edits to tox. Errors with BackendAllauth may still be present

* removed six; removed Python2 compatibility due to EOL/Code Freeze

* removed six from install_requires

* removed six from install_requires

* Travis CI Integration

* PUSH ISSUE | MAKING SLIGHT CHANGE TO FIX COMMIT ISSUE try-except clause for django.conf.urls/django.urls due to v1.11 limitations

* PUSH ISSUE | MAKING SLIGHT CHANGE TO FIX COMMIT ISSUE try-except clause for django.conf.urls/django.urls due to v1.11 limitations

* removing cache keys from travis to check against errors

* pinned django-allauth version to 0.40.0 due to Dec update ditching Django v!+.  Pushing to test.

* Fixed malformed tox.ini setting for django-allauth version pin.

* Update README

Neglected to omit a line about working on a test branch.  Removed.

* Removed six + Django 1.11 support, per @bee-keeper's request

* Removed django.conf.urls conditional import now that Django 1.11 support is being dropped

* re-added conditional url imports at test_urls; removed six from requirements

* fixed Django3 version error in tox.ini; removed conditional import of url and replaced with re_path

* fixed tox error w/Python3.5 by removing Django v.3.0 from testing; Django 3 is only compatible with Python 3.6 onward.

* continue to test against 1.x

* tox

Co-authored-by: Francis Secada <francis.secada@gmail.com>
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