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 averagecopier #847

Merged
merged 3 commits into from
Feb 3, 2017

Conversation

janga1997
Copy link
Member

#808
mypy produces no errors. Same issue with the tests as #846 .

Copy link
Member

@drvinceknight drvinceknight left a comment

Choose a reason for hiding this comment

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

Thanks, could you add axelrod/strategies/averagecopier.py to type_tests.sh please.

The tests are just warnings so not actually triggering failures.

@janga1997
Copy link
Member Author

@drvinceknight What exactly is the conflict here?

@drvinceknight
Copy link
Member

@drvinceknight What exactly is the conflict here?

You seem to have a slightly older version of type_tests.sh on your branch. If you can pull an up to date master branch, rebase (or merge) then you will be able to see the merge conflict clearly.

Let us know if any of that is unclear.

@janga1997
Copy link
Member Author

janga1997 commented Feb 2, 2017

@drvinceknight I've messed this branch.And you seem to have made a new commit just now. Is there any way to backtrack to before?

@janga1997
Copy link
Member Author

Would it be easier to delete the local branch and pull from the branch at my fork again?

@drvinceknight
Copy link
Member

Would it be easier to delete the local branch and pull from the branch at my fork again?

Yup, that's probably the easiest thing to do in this case. If adding the module to type_tests.sh causes too much of a headache don't worry we can do that at a later point. :)

@janga1997
Copy link
Member Author

@drvinceknight Fortunately it worked. :)

@drvinceknight
Copy link
Member

@drvinceknight Fortunately it worked. :)

Great!

@marcharper marcharper merged commit 9dc96f8 into Axelrod-Python:master Feb 3, 2017
@janga1997 janga1997 deleted the typeHint-averagecopier branch February 3, 2017 04:18
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.

3 participants