Test cleanup issue 1287 #1308

sudarshan-parvatikar · 2020-04-02T11:58:13Z

I have refactored the code according to Issue:1287. I also re-ordered import statements to make them consistent across all files and ran tests. The tests passed and I thinks this should close Issue:1287.

…sts/integration/* and axelrod/tests/property.py

…s/strategies/*

…/unit/*

…erties.py

…tests/unit/test_match.py

drvinceknight · 2020-04-03T11:06:58Z

There seems to be a merge conflict, can you rebase this on to master?

…sts/integration/* and axelrod/tests/property.py

…s/strategies/*

…/unit/*

…erties.py

…tests/unit/test_match.py

…1287' into test-cleanup-issue-1287

sudarshan-parvatikar · 2020-04-03T19:08:51Z

Sorry about the merge conflicts, this was the first time I was exposed to merge conflicts. I rebased to master and fixed merge conflicts. The tests also passed on my end.

… tests/strategies/test_ann.py

gaffney2010

This is a really nice clean up.

It looks like there is a few lines missed.

It also looks like your editor changed the import order of unrelated imports. I don't think we've been consistent about import order. But some of these changes add a lot of new lines, and I think we probably don't want to do that.

gaffney2010 · 2020-04-04T20:04:47Z

axelrod/tests/strategies/test_cycler.py


-import axelrod
+import axelrod as axl
 from axelrod import AntiCycler, Cycler, EvolvableCycler


Delete this line and update references throughout file.

gaffney2010 · 2020-04-04T20:08:29Z

axelrod/tests/strategies/test_evolvable_player.py

 import random
-import unittest

 import axelrod as axl
 from axelrod import EvolvablePlayer, seed


Delete this line, and update.

gaffney2010 · 2020-04-04T20:12:21Z

axelrod/tests/strategies/test_memoryone.py

 import warnings

-import axelrod
+import axelrod as axl
 from axelrod import Game


Delete line and update

gaffney2010 · 2020-04-04T20:15:07Z

axelrod/tests/strategies/test_player.py

@@ -1,22 +1,27 @@
+import unittest


Should there be space between each of these imports?

gaffney2010 · 2020-04-04T20:15:19Z

axelrod/tests/strategies/test_player.py

 import numpy as np
+
+import axelrod as axl
 from axelrod import DefaultGame, Player, LimitedHistory


Delete and update

gaffney2010 · 2020-04-04T20:24:06Z

axelrod/tests/unit/test_moran.py

 import matplotlib.pyplot as plt
+
+import axelrod as axl
 from axelrod import ApproximateMoranProcess, MoranProcess, Pdf


Delete and update

gaffney2010 · 2020-04-04T20:28:40Z

axelrod/tests/unit/test_resultset.py

+from numpy import mean, nanmedian, std
+
+import axelrod as axl
+import axelrod.interaction_utils as iu


Looking at the issue. It looks like it was decide that only axelrod would be imported like this, and that you'd use axl.interaction_utils elsewhere.

Yeah, that's right.

gaffney2010 · 2020-04-04T20:29:41Z

axelrod/tests/unit/test_tournament.py

@@ -1,19 +1,29 @@
 """Tests for the main tournament class."""

+import unittest


gaffney2010 · 2020-04-04T20:31:53Z

axelrod/tests/unit/test_interaction_utils.py

 from collections import Counter

-import axelrod
+import axelrod as axl
 import axelrod.interaction_utils as iu


Delete this line. Ditto from comment on other file.

Ditto from comment on other file.

Can you tell me which comment that you're talking about?

import axelrod.interaction_utils as iu

It looks like it was decided to just import axelrod, and to replace iu with axelrod.interaction_utils.

gaffney2010 · 2020-04-04T20:32:24Z

axelrod/tests/unit/test_pickling.py

 import random
-import unittest

 import axelrod as axl
 import axelrod.strategy_transformers as st


Delete this line. It looks like that is what was decided on another file.

sudarshan-parvatikar · 2020-04-04T21:10:31Z

This is a really nice clean up.

It looks like there is a few lines missed.

It also looks like your editor changed the import order of unrelated imports. I don't think we've been consistent about import order. But some of these changes add a lot of new lines, and I think we probably don't want to do that.

Hey @gaffney2010! . Thank you for your helpful comments. I reordered the import statements so that they'd be consistent. However, you're right about adding new lines, so I'll update them as per your reviews. Furthermore, is it ok if the import statements be as in PEP 8 import rules, as explained by this answer on SO. This may possibly make the import statements more consistent in the future.

gaffney2010 · 2020-04-04T21:18:22Z

Furthermore, is it ok if the import statements be as in PEP 8 import rules, as explained by this answer on SO.

Yes.

sudarshan-parvatikar · 2020-04-05T06:07:24Z

I have updated the code as per the recent review. Imports are grouped according to the PEP-8 convention, and new lines between the import statements are removed

gaffney2010 · 2020-04-06T06:36:34Z

This looks good aside from the three places where you have:
import axelrod.xxx as yyy

I think it was decided in the issue to only import axelrod.

sudarshan-parvatikar · 2020-04-06T06:53:14Z

This looks good aside from the three places where you have:
import axelrod.xxx as yyy

I think it was decided in the issue to only import axelrod.

Yes, I now understand what you meant to say. I'll fix it asap :)

drvinceknight · 2020-04-06T10:17:48Z

Thanks @sudarshan-parvatikar all looks good to me 👍

sudarshan-parvatikar · 2020-04-06T10:27:56Z

Thanks all for being so patient and helpful. 😄

sudarshan-parvatikar added 6 commits March 31, 2020 11:28

refactored import statements as 'import axelrod as axl' in axelrod/te…

7dd2f26

…sts/integration/* and axelrod/tests/property.py

refactored import statements to 'import axelrod as axel' axelrod/test…

d74975a

…s/strategies/*

refactored import statements to 'import axelrod as axl' axelrod/tests…

0715624

…/unit/*

refactored import statement for axel.strategies in axelrod/tests/prop…

977ed05

…erties.py

fixed non-updated 'axelrod.*' calls to axl.*'

1f6b434

fixed un-updated import statements in tests/unit/test_actions.py and …

9416fd2

…tests/unit/test_match.py

sudarshan-parvatikar added 8 commits April 4, 2020 00:16

refactored import statements as 'import axelrod as axl' in axelrod/te…

92702ac

…sts/integration/* and axelrod/tests/property.py

refactored import statements to 'import axelrod as axel' axelrod/test…

9fff017

…s/strategies/*

refactored import statements to 'import axelrod as axl' axelrod/tests…

afc2ed4

…/unit/*

refactored import statement for axel.strategies in axelrod/tests/prop…

f967b58

…erties.py

fixed non-updated 'axelrod.*' calls to axl.*'

2288674

fixed un-updated import statements in tests/unit/test_actions.py and …

ed437bf

…tests/unit/test_match.py

Merge remote-tracking branch 'refs/remotes/origin/test-cleanup-issue-…

25acbd5

…1287' into test-cleanup-issue-1287

rebased master and fixed merge conflict

9ef4dde

reordered import statements in tests/integration/test_tournament.py &…

8947e69

… tests/strategies/test_ann.py

gaffney2010 reviewed Apr 4, 2020

View reviewed changes

removed blank line bw import stmts, fixed import issues

0ae2a01

fixed import statements

c4a19c2

gaffney2010 approved these changes Apr 6, 2020

View reviewed changes

drvinceknight merged commit d4735cb into Axelrod-Python:master Apr 6, 2020

This was referenced Apr 6, 2020

Test Cleanup #1287

Closed

Create function to handle relative paths #1307

Merged

sudarshan-parvatikar deleted the test-cleanup-issue-1287 branch April 6, 2020 10:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Test cleanup issue 1287 #1308

Test cleanup issue 1287 #1308

sudarshan-parvatikar commented Apr 2, 2020

drvinceknight commented Apr 3, 2020

sudarshan-parvatikar commented Apr 3, 2020

gaffney2010 left a comment

gaffney2010 Apr 4, 2020

gaffney2010 Apr 4, 2020

gaffney2010 Apr 4, 2020

gaffney2010 Apr 4, 2020

gaffney2010 Apr 4, 2020

gaffney2010 Apr 4, 2020

gaffney2010 Apr 4, 2020

sudarshan-parvatikar Apr 5, 2020

gaffney2010 Apr 4, 2020

gaffney2010 Apr 4, 2020

sudarshan-parvatikar Apr 5, 2020 •

edited

gaffney2010 Apr 6, 2020

gaffney2010 Apr 4, 2020

sudarshan-parvatikar commented Apr 4, 2020

gaffney2010 commented Apr 4, 2020

sudarshan-parvatikar commented Apr 5, 2020

gaffney2010 commented Apr 6, 2020

sudarshan-parvatikar commented Apr 6, 2020

drvinceknight commented Apr 6, 2020

sudarshan-parvatikar commented Apr 6, 2020

		@@ -1,19 +1,29 @@
		"""Tests for the main tournament class."""

		import unittest

Test cleanup issue 1287 #1308

Test cleanup issue 1287 #1308

Conversation

sudarshan-parvatikar commented Apr 2, 2020

drvinceknight commented Apr 3, 2020

sudarshan-parvatikar commented Apr 3, 2020

gaffney2010 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sudarshan-parvatikar Apr 5, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sudarshan-parvatikar commented Apr 4, 2020

gaffney2010 commented Apr 4, 2020

sudarshan-parvatikar commented Apr 5, 2020

gaffney2010 commented Apr 6, 2020

sudarshan-parvatikar commented Apr 6, 2020

drvinceknight commented Apr 6, 2020

sudarshan-parvatikar commented Apr 6, 2020

sudarshan-parvatikar Apr 5, 2020 •

edited