Support for Oscar 1.1 and Django 1.8 #113
Merged
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
With recent versions of Oscar, adding this app is required for the sandbox to work. Without it, some of the Oscar templates choke.
When I tried the sandbox, the installed version wasn't compatible with the installed version of Django. Bumping it fixes the problem.
I was slightly confused by how the sandbox works, so I added a comment to make my life easier the second time I look at this.
maiksprenger
force-pushed
the
feature/polish
branch
from
40c0c44
to
5bf8fa9
Compare
I find them annoying and never needed them. If anybody objects, I'm happy to enable more fine-grained control.
Our policy is to support the two latest versions of Django and Oscar. This commit moves us towards that goal by enabling tests for them. Some requirements needed bumping to get the tests to start.
get_shipping_methods was called with different parameters in different parts of the code. This commit now changes things to call it with as much information as is available at the time, hence always including the request and the basket. It also uses named keyword arguments to make backwards compatibility easier (as the method signature obviously changed). Closes #99.
As we stopped supporting Oscar < 1.0, we can remove a bit of code.
Freaky, I got Django complaining about South migration files being present in django-extensions, and indeed 1.5.7 still ships with them in the migrations folder (which should be called south_migrations since the release of Django 1.7). While I wonder why I haven't run into this issue before, I don't care enough to find out and just disable it.
maiksprenger
force-pushed
the
feature/polish
branch
from
ca55719
to
a9ece08
Compare
ShippingAddress fields don't allow setting None (null=False), so for missing values we should set empty strings instead. If my analysis is correct, this fixes #100. If it doesn't, it's still a correct change.
maiksprenger
force-pushed
the
feature/polish
branch
from
f9acdc9
to
9db7991
Compare
maiksprenger
added a commit
that referenced
this pull request
Nov 13, 2015
Support for Oscar 1.1 and Django 1.8
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.
Does what it says on the tin, and a bit of cleanup here and there.