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

Devel #140

Merged
merged 3 commits into from Feb 7, 2020
Merged

Devel #140

merged 3 commits into from Feb 7, 2020

Conversation

bee-keeper
Copy link
Member

No description provided.

fsecada01 and others added 3 commits February 7, 2020 17:05
* 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.
@bee-keeper bee-keeper merged commit dde51ff into master Feb 7, 2020
@bee-keeper bee-keeper deleted the devel branch February 7, 2020 18:08
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

2 participants