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

Tox integration added #47

Merged
merged 4 commits into from
Dec 30, 2014
Merged

Tox integration added #47

merged 4 commits into from
Dec 30, 2014

Conversation

brmc
Copy link
Contributor

@brmc brmc commented Dec 13, 2014

Hey Michael,

I added the support for tox, and in doing so I did the following:

  • The contents of django_silky/ and silk/tests were moved to tests/, and a symlink was created from tests/ back to ../silk so files don't need to be copied during testing
  • Imports in the tests were refactored to match the new structure(including tests/init.py)
  • Trivial modifications were made to the test settings file to accomodate different testing environments
  • Updated Readme to reflect testing for django 1.7
  • .travis.yml was edited to play nicely with tox

brmc added 4 commits December 13, 2014 11:05
The contents of django_silky/ and silk/tests were moved to tests/, and a symlink was created from silk/tests back to ../silk so files don't need to be copied during testing
Imports in the tests were refactored to match the new structure(including tests/__init__.py
Trivial modifications were made to the test settings file to accomodate different testing environments
Updated Readme to reflect tests in django 1.7
@mtford90
Copy link
Collaborator

Awesome great work! Sorry that i'm being slow to respond on this, will merge this in later today/tomorrow ;)

@brmc
Copy link
Contributor Author

brmc commented Dec 18, 2014

no worries. i thought i was slow myself. im glad it helped.

On Thu, Dec 18, 2014 at 9:04 PM, Michael Ford [email protected]
wrote:

Awesome great work! Sorry that i'm being slow to respond on this, will
merge this in later today/tomorrow ;)


Reply to this email directly or view it on GitHub
#47 (comment).

mtford90 added a commit that referenced this pull request Dec 30, 2014
Tox integration added
@mtford90 mtford90 merged commit 66516fb into jazzband:master Dec 30, 2014
@mtford90
Copy link
Collaborator

@brmc Again much appreciated and sorry for the delay... Looks great though and works fine. Haven't tested how this affects releases to PyPi though?

I'm probably gonna be very busy for the next couple months - if you're going to making lots of changes as you mentioned it will likely be worth giving you commit rights instead as I don't want to put you off by being very slow ;)

@mtford90 mtford90 mentioned this pull request Dec 30, 2014
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.

2 participants