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

Fix docstrings, pep8, pep257, and add param doc for in exceptions.py #786

Closed

Conversation

terryjbates
Copy link
Contributor

No description provided.

@codecov-io
Copy link

codecov-io commented Jul 27, 2016

Current coverage is 100% (diff: 100%)

Merging #786 into master will not change coverage

@@           master   #786   diff @@
====================================
  Files          14     15     +1   
  Lines         599    605     +6   
  Methods         0      0          
  Messages        0      0          
  Branches        0      0          
====================================
+ Hits          599    605     +6   
  Misses          0      0          
  Partials        0      0          

Sunburst

Powered by Codecov. Last update 5db20b2...8be6e8a

@@ -1,103 +1,90 @@
#!/usr/bin/env python
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please remove the shebang? Thank you! 🙇

@terryjbates
Copy link
Contributor Author

@hackebrot Appears that removing the shebang line causes Travis CI to fail, due to an InvocationError

https://travis-ci.org/audreyr/cookiecutter/jobs/152247749

A bit mysterious. How shall we proceed?

@michaeljoseph
Copy link
Contributor

@terryjbates the test failure looks unrelated to your change.

And @hackebrot has already raised an issue for the underlying problem: pytest-dev/pytest-mock#59

I guess we should pin pytest-mock for now.

@michaeljoseph
Copy link
Contributor

@terryjbates rebasing on master to get 2d0affe should fix this failure now.

@terryjbates
Copy link
Contributor Author

terryjbates commented Aug 16, 2016

Mkay...not sure if I have horked this up or not, so let me know if I have! Tried the following:

  1. On local master branch executed git fetch upstream and git merge upstream/master.
  2. Changed branches to the topic branch of tbates-pep257-742-exceptions.
  3. Did git pull.
  4. Did git rebase -i master melded one two commits that were there into one.
  5. git status indicated I had 10 and 2 commits in local and remote branch respectively.
  6. Did a git pull --rebase.
  7. Did git push and the Travis CI and Appveyor workflows seemed to have kicked off here in this PR.

Travis CI still seemed unhappy initially, though I do see this passes locally when I run:

tox -e py36

And I can see commit ceb0e409 via git log on that same topic branch.

@hackebrot
Copy link
Member

Hi @terryjbates! 👋

Not really sure what happened here.

Can you please try the following:

  • git checkout master
  • git fetch upstream
  • git merge upstream/master
  • git push origin

Now your master should be up-to-date both locally and your fork.

  • git checkout tbates-pep257-742-exceptions
  • git rebase master
  • git log master..HEAD

You should see two commits, both from you.

@hackebrot hackebrot added the unresolved conflict PR Only: This PR has merge conflict, that should be resolved by author label Aug 20, 2016
@terryjbates
Copy link
Contributor Author

Thanks @hackebrot! I'm giving your commands a shot now. Thanks for helping get through merge hell. Looking back, I suspect I may not have pushed my local master to the master on GitHub.

@terryjbates terryjbates closed this Oct 7, 2016
@terryjbates terryjbates deleted the tbates-pep257-742-exceptions branch October 7, 2016 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
unresolved conflict PR Only: This PR has merge conflict, that should be resolved by author
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants