DM-7258: Port to Python 3 #5
Conversation
I preserved one table in a test that used extra whitespace to improve readability
Instead of testing two separate arrays, the same array was being compared to itself (because the two variables in question were views to the same underlying data). Also use assertMasksEqual instead of custom code.
Remove some unused imports Standardize import order Fix a few lines that were too long I left one flake8 warning about whitespace for clarity
|
|
||
| pexLog.Trace_setVerbosity("lsst.coadd.utils", Verbosity) | ||
|
|
||
| try: | ||
| dataDir = lsst.utils.getPackageDir('afwdata') | ||
| medMIPath = os.path.join(dataDir, "data", "med.fits") |
There was a problem hiding this comment.
I'll make the general comment that the tests use medMIPath but skip on dataDir. The tests themselves don't use dataDir so I think I'd prefer it if medMIPath was the thing that was set to None and was the thing that the skip test used. It seems more consistent to me to skip on the thing that the test is using.
There was a problem hiding this comment.
I prefer the code as written because the skip is caused by afwdata not being setup. I think it is clearer to test on that, so that the test message matches the thing being tested, and it is more forward looking in that we may decide to add tests that use additional data from afwData. That said, the I strongly prefer the naming in coadd.py, e.g. AfwDataDir, as and a capitalized name for the file being used.
An alternative you may prefer is for each test to generate the path to the file being tested itself, so the only global is AfwDataDir. For coadd.py I'm not very happy with that only because the same file is used in 3 places, but I guess I could make the subpath a module global and repeat the os.path.join in each test.
There was a problem hiding this comment.
I have committed that alternative, changing both tests that you commented on. I hope you like it.
Use AfwdataDir as the path to the afwData package. Add another constant for the path to the desired data file(s), relative to AfwdataDir (instead of absolute and only defined if afwdata is setup). Build the path to the final desired image(s) using os.path.join when needed.
No description provided.