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

Add type hints to calculator #850

Merged
merged 4 commits into from
Feb 5, 2017

Conversation

janga1997
Copy link
Member

#808
No errors with mypy. @drvinceknight @marcharper

@drvinceknight
Copy link
Member

Great! Could you add the file to type_tests.sh please? :)

@drvinceknight
Copy link
Member

There's a merge conflict in type_tests.sh (probably since I merged in your other PRs) @janga1997. Let me know if you need a hand fixing it :)

@janga1997
Copy link
Member Author

@drvinceknight Apparently its a lot easier to resolve it on Github itself, if its just a few lines.

@drvinceknight
Copy link
Member

Merge conflicts have reappeared (since I just merge in that other strategy).

@janga1997
Copy link
Member Author

Next time, I think I will do a couple of strategies in one single pull request.

@janga1997
Copy link
Member Author

@drvinceknight If you have the time, could you respond to me on #379 ?

@janga1997
Copy link
Member Author

@drvinceknight I suppose this PR is good for a merge?

@drvinceknight drvinceknight merged commit 181ca2b into Axelrod-Python:master Feb 5, 2017
@janga1997 janga1997 deleted the typeHint-calculator branch February 5, 2017 18:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants