django-saml2-idp

Merge ~quantifics/django-saml2-idp/+git/stable:django-1.11 into ~ubuntuone-pqm-team/django-saml2-idp/+git/stable:master

  1. Git
  2. lp:~quantifics/django-saml2-idp/+git/stable
  3. django-1.11
  4. Merge into master
Proposed by John Paraskevopoulos
Status: Merged
Approved by: John Paraskevopoulos
Approved revision: 1a473055fab397f32c6d96a41090021d29d0415d
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~quantifics/django-saml2-idp/+git/stable:django-1.11
Merge into: ~ubuntuone-pqm-team/django-saml2-idp/+git/stable:master
Diff against target: 686 lines (+187/-119)
26 files modified
.gitignore (+60/-0)
idptest/manage.py (+6/-8)
idptest/saml2idp/base.py (+12/-11)
idptest/saml2idp/codex.py (+7/-6)
idptest/saml2idp/demo.py (+3/-3)
idptest/saml2idp/google_apps.py (+5/-4)
idptest/saml2idp/metadata.py (+2/-1)
idptest/saml2idp/registry.py (+6/-6)
idptest/saml2idp/salesforce.py (+4/-3)
idptest/saml2idp/templates/saml2idp/base.html (+6/-8)
idptest/saml2idp/tests/__init__.py (+0/-5)
idptest/saml2idp/tests/base.py (+7/-10)
idptest/saml2idp/tests/test_deeplink.py (+5/-5)
idptest/saml2idp/tests/test_google_apps.py (+3/-2)
idptest/saml2idp/tests/test_salesforce.py (+2/-1)
idptest/saml2idp/tests/test_signing.py (+3/-2)
idptest/saml2idp/tests/test_views.py (+2/-2)
idptest/saml2idp/urls.py (+4/-8)
idptest/saml2idp/views.py (+6/-5)
idptest/saml2idp/xml_render.py (+3/-2)
idptest/saml2idp/xml_signing.py (+4/-3)
idptest/settings.py (+22/-6)
idptest/templates/base.html (+1/-1)
idptest/urls.py (+9/-11)
requirements.txt (+2/-4)
setup.py (+3/-2)
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+416144@code.staging.launchpad.net

Commit message

Support Django 1.11 and prepare for Python 3

Description of the change

- Uses only BeautifulSoup 4
- Use Django 1.11 template loaders
- Rename tests so that Django 1.11 can see them
- Use absolute imports
- Make exception handling py3 compatible

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

+1 with two questions.

1) Is it worth adding something in setup.py to indicate it'll only work with Django 1.11 or whatever? (mainly so it blows up if someone tries to set up this new version with Django 1.4 or some old thing).

1.5) Is it worth bumping the version number in setup.py as well, since we now have a major bump in dependencies? (Django 1.11.x)

2) See diff comment below

review: Approve
Revision history for this message
John Paraskevopoulos (quantifics) wrote :

> +1 with two questions.
>
> 1) Is it worth adding something in setup.py to indicate it'll only work with
> Django 1.11 or whatever? (mainly so it blows up if someone tries to set up
> this new version with Django 1.4 or some old thing).

Will pin it in "install_requires" sure +1

>
> 1.5) Is it worth bumping the version number in setup.py as well, since we now
> have a major bump in dependencies? (Django 1.11.x)
>

Sure. I'm thinking of version 1.0 and marking the transition to python3-only as version 2.0 maybe?
So if in the future we want to have updates about python2 we can keep them in a separate branch and keep bumping v1 while at the same time v2 will transition to django 2+

Revision history for this message
Daniel Manrique (roadmr) wrote :

OK, I agree on both counts (1.0 sounds fine, this code has been in production for years anyway).

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches