search

lsst-ts / ts_phosim

High-Level Module to Perturb the PhoSim
GNU General Public License v3.0
0 stars 1 forks source link

Tickets/DM-37268: Pass filterType to ts_wep config #79

Closed suberlak closed 1 year ago

suberlak commented 1 year ago

Updated writeWepConfiguration and generateRefCatalog, so that they use the filterType information, and read the magnitude limits for donut selector from magLimits.yaml. Added two functions to help with reading magnitude limits and converting ref or "" to g filter. Added tests for new functions, as well as writeWepConfiguration.

suberlak commented 1 year ago

I ran the black 22.10.0 on CloseLoopTask, because when I ran pytest on the ticket branch, I was getting black errors. Yet now I see that it is black that fails on CI https://tssw-ci.lsst.org/job/LSST_Telescope-and-Site/job/ts_phosim/job/tickets%252FDM-37268/2/consoleFull. The CI has black-0.3.12 I wonder if the two black versions are divergent?

teweitsai commented 1 year ago

My black version in the docker container (lsstts/develop-env:develop) is:

[saluser@1bde3b00e858 ts_m2gui]$ black --version
black, 22.10.0 (compiled: no)
Python (CPython) 3.10.8

I thought the CI task will base on the docker image. Is it possible for you to reproduce this locally?

There was one huge update in Jenkins plugins and versions in yesterday. Maybe you could contact Rob if you could not reproduce this locally?

For the package I am working on recently, I have this in the CI job as well (black-0.3.12): https://tssw-ci.lsst.org/job/LSST_Telescope-and-Site/job/ts_m2gui/job/tickets%252FDM-37262/2/consoleFull

platform linux -- Python 3.10.8, pytest-7.2.0, pluggy-1.0.0
PySide2 5.13.2 -- Qt runtime 5.12.9 -- Qt compiled 5.12.9
rootdir: /home/jenkins/workspace/d-Site_ts_m2gui_tickets_DM-37262, configfile: pyproject.toml
plugins: asdf-2.10.1, hypothesis-6.61.0, arraydiff-0.3, astropy-0.10.0, astropy-header-0.1.2, cov-4.0.0, doctestplus-0.12.1, filter-subpackage-0.1.1, flake8-1.1.1, mock-3.10.0, openfiles-0.5.0, remotedata-0.4.0, session2file-0.1.11, subtests-0.9.0, xdist-3.1.0, qt-4.1.0, xvfb-2.0.0, anyio-3.6.2, asyncio-0.18.3, black-0.3.12, mypy-0.8.0, tornasync-0.6.0.post2
asyncio: mode=strict
collected 219 items

Or is it possible for you to tune the format in the code to make it pass in black 22.10.0 and black-0.3.12? I think there is some part of code format that black does not have the restrict requirement.

Thanks!

suberlak commented 1 year ago

I ran black using version 22.10 from pip show black and pytest --black with pytest-black version 0.3.12 from pip show pytest-black , to ensure compatibility with the docker CI.