Django 1.9 #27
Merged
Django 1.9 #27
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 6 commits
February 3, 2016 14:33
|
Not sure, I fully understand. I'll have a look soon. |
- Moved version definition back into __init__.py (instead of setup.py), like the other extensions - Wrapped register() call in __init__.py in try/except to avoid problems when it is called during setup.py - Re-added geokey dependency (>=0.9.3) in requirements.txt as it should now be harmless (at least since geokey v0.9.3; and more specifically this change: ExCiteS/geokey@bd95e68) - Updated .travis.yml to *first* install django (either 1.8.x or 1.9.x depending on the env), and no longer install GeoKey explicitly as it should now be installed by pip as a geokey_sapelli dependency) Signed-off-by: Matthias Stevens <matthias.stevens@gmail.com>
Signed-off-by: Matthias Stevens <matthias.stevens@gmail.com>
|
This can be merged into master now. If you're okay with it I'll release it as 0.7.2. |
|
Not really happy with this. The reason I install GeoKey on Travis CI because I want to create a multi scenario for the future GeoKey releases, so that extension would be tested with 0.9, 0.10, 0.11 etc. |
|
I see. Then I'll put the explicit, env-based, geokey installation back in the travis script. |
Signed-off-by: Matthias Stevens <matthias.stevens@gmail.com>
|
Done, and everything still works. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
geokey-sapelli cannot use Django 1.8 due to the requirements implementation, which then comes from GeoKey requiring Django===1.8.8.
We can't set Django>=1.8 on GeoKey as proposed, because it will then satisfy Django future releases of Django (let's say 1.10 or 2.0), but not sure if all adjustments will be done on GeoKey side to support those future releases.
Any thoughts?