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

Merged all improvements from other branches #4

Closed
wants to merge 22 commits into from

Conversation

glyphobet
Copy link
Contributor

This pull request includes all the improvements in other branches of this library on github.

Included are:

  • New ProductConfigurable class which requires the magento-webservices module by @resteve
  • ProductAttribute.info method based on work by @resteve
  • ProductAttribute.createOption by @www-xilus-es, renamed to ProductAttribute.addOption to match the Magento API's name by @glyphobet
  • ProductAttribute.removeOption by @resteve
  • ProductAttribute.create, ProductAttribute.update by @glyphobet
  • PEP8 cleanup by @resteve
  • Fixed multicall by Ali Dropt/magento@8a5fea7f98821290e5fa61d198e8f8ea1013e6b0
  • README in markdown format by @glyphobet
  • Some minor changes and cleanup

resteve and others added 22 commits November 28, 2011 15:07
[IMP] Added support for create attributes options.
Conflicts:
	magento/__init__.py
Previously this was a layering violation. There's no reason for `create` to change the argument signature of just this method, base64 encode the image, and detect its mime-type, especially if `update` does not do any of that. The calling code should be responsible for encoding and mime-type detecting in both cases, and both methods should match the Magento API.
@sharoonthomas
Copy link

@glyphobet is it ok to rebase (squash) some of these commits to maintain a clean history ?

@glyphobet
Copy link
Contributor Author

@sharoonthomas which commits do you think should be squashed together? It seems pretty clean to me.

@sharoonthomas
Copy link

The commits from zigzag.

I can do it and may not be a problem, Since the authors are same ?

Sharoon Thomas

  • sent from Mobile

On Apr 24, 2013, at 6:03 PM, Matt Chisholm [email protected] wrote:

@sharoonthomas which commits do you think should be squashed together? It seems pretty clean to me.


Reply to this email directly or view it on GitHub.

@glyphobet
Copy link
Contributor Author

Ok, maybe it would be better if you do it because I'm not sure I know what you want.

@sharoonthomas
Copy link

@glyphobet I have done the rebasing and the commit message cleanup.

You can see the changes at: https://github.com/openlabs/magento/compare/goodscloud-merge

The only commit I dropped, is the one which converted the README to markdown. I think python programmers are more comfortable with ReST and works very well with PYPI too since we want consistent information to be displayed both on github and on PYPI.

However, I have added your contributions to the README in the last commit.

If it looks good to you, I can merge it.

@glyphobet
Copy link
Contributor Author

Looks fine to me.

I don't know any Python programmers who are still using ReST, everyone seems to have moved to Markdown, but that's not a big deal, and ultimately it's up to you.

sharoonthomas pushed a commit that referenced this pull request Apr 25, 2013
The original pull request #4 was refactored and commits were reorganized to have a cleaner history.

Thanks to @goodscloud for collecting improvements from different forks
@sharoonthomas
Copy link

I have merged all the changes and also made a release with version 0.2
I have pushed it to PyPI too.

Thank you for your contribution.

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.

3 participants