Skip to content

[OP] Enable ECmean time selection#2761

Merged
mcadau merged 2 commits intov0.19-operationalfrom
v0.19-op-ecmean-fix
Mar 11, 2026
Merged

[OP] Enable ECmean time selection#2761
mcadau merged 2 commits intov0.19-operationalfrom
v0.19-op-ecmean-fix

Conversation

@mcadau
Copy link
Collaborator

@mcadau mcadau commented Mar 10, 2026

PR description:

Porting of AQUA-diagnostics PR #178


Please leave the checkboxes that apply to this pull request.
If you find a missing checkbox, please add it to the list.
Make sure to complete the checkboxes before applying the "ready to merge" label.
Please apply the "run tests" label if you want to trigger CI tests.

  • Docstrings are updated if needed.
  • Changelog is updated.

@mcadau
Copy link
Collaborator Author

mcadau commented Mar 10, 2026

@oloapinivad so far I implemented also the changes regarding #159, but actually the error regarding so and thetao was not occurring in v0.19-operational branch.
What's your opinion? Should we only keep the correct time selection change or both changes implemented here are fine to keep? On this branch in any case the diagnostic runs and successfully generates the plots.

Anyway, I devoted my LUMI for v0-19-operational AQUA analysis runs, and this is behaving exactly as expected: before this PR, the same issue experienced in #168 occurred for current main has occurred in v0.19-operational as well. With this branch, the issue is solved

@mcadau mcadau requested a review from oloapinivad March 10, 2026 05:25
@mcadau mcadau self-assigned this Mar 10, 2026
@mcadau mcadau added ready to merge This PR is ready to merge in the opinion of the author v0.19-operational o26.1 operational release labels Mar 10, 2026
@codecov
Copy link

codecov bot commented Mar 10, 2026

❌ 2 Tests Failed:

Tests completed Failed Passed Skipped
511 2 509 1
View the top 2 failed test(s) by shortest run time
tests/test_console.py::TestAquaConsole::test_console_without_home
Stack Traces | 2.05s run time
self = <test_console.TestAquaConsole object at 0x7fbe40c3b200>
delete_home = <function delete_home.<locals>._modify_home at 0x7fbe1bbec680>
run_aqua = <function run_aqua.<locals>._run_aqua_console at 0x7fbe24720f40>
tmpdir = PosixPath('.../pytest-of-root/pytest-0/tmp0')
run_aqua_console_with_input = <function run_aqua_console_with_input.<locals>._run_aqua_console at 0x7fbe24720540>

    def test_console_without_home(self, delete_home, run_aqua, tmpdir, run_aqua_console_with_input):
    
        # getting fixture
        delete_home()
        mydir = str(tmpdir)
    
        print(f"HOME is set to: {os.environ.get('HOME')}")
    
        # check unexesting installation
        with pytest.raises(SystemExit) as excinfo:
            run_aqua(['install', MACHINE])
            assert excinfo.value.code == 1
    
        # install from path without home
        shutil.rmtree(os.path.join(mydir, 'vicesindaco'))
        run_aqua_console_with_input(['-v', 'install', MACHINE, '-p', os.path.join(mydir, 'vicesindaco')], 'yes')
        assert os.path.isdir(os.path.join(mydir, 'vicesindaco'))
        assert os.path.isfile(os.path.join(mydir, 'vicesindaco', 'config-aqua.yaml'))
>       assert not os.path.exists(os.path.join(mydir, '.aqua'))
E       AssertionError: assert not True
E        +  where True = <function exists at 0x7fbe7af63380>('.../pytest-of-root/pytest-0/tmp0/.aqua')
E        +    where <function exists at 0x7fbe7af63380> = <module 'posixpath' (frozen)>.exists
E        +      where <module 'posixpath' (frozen)> = os.path
E        +    and   '.../pytest-of-root/pytest-0/tmp0/.aqua' = <function join at 0x7fbe7ad24900>('.../pytest-of-root/pytest-0/tmp0', '.aqua')
E        +      where <function join at 0x7fbe7ad24900> = <module 'posixpath' (frozen)>.join
E        +        where <module 'posixpath' (frozen)> = os.path

tests/test_console.py:587: AssertionError
tests/test_console.py::TestAquaConsole::test_console_list
Stack Traces | 11.2s run time
self = <test_console.TestAquaConsole object at 0x7fbe40c3a4e0>
tmpdir = PosixPath('.../pytest-of-root/pytest-0/tmp0')
run_aqua = <function run_aqua.<locals>._run_aqua_console at 0x7fbe302702c0>
set_home = <function set_home.<locals>._modify_home at 0x7fbe30273920>
capfd = <_pytest.capture.CaptureFixture object at 0x7fbe1f7693a0>
run_aqua_console_with_input = <function run_aqua_console_with_input.<locals>._run_aqua_console at 0x7fbe30272660>

    def test_console_list(self, tmpdir, run_aqua, set_home, capfd, run_aqua_console_with_input):
    
        # getting fixture
        mydir = str(tmpdir)
        set_home(mydir)
    
        # aqua install
        run_aqua(['install', MACHINE])
        run_aqua(['add', 'ci'])
        run_aqua(['add', 'ciccio', '-e', 'AQUA_tests/catalog_copy'])
        run_aqua(['list', '-a'])
    
        out, _ = capfd.readouterr()
        assert 'AQUA current installed catalogs in' in out
        assert 'ci' in out
        assert 'ciccio (editable' in out
        assert 'ifs.yaml' in out
        assert 'HealPix.yaml' in out
    
        run_aqua(['avail', '--repository', 'DestinE-Climate-DT/Climate-DT-catalog'])
        out, _ = capfd.readouterr()
    
        assert 'climatedt-phase1' in out
>       assert 'lumi-phase1' in out
E       assert 'lumi-phase1' in "Available ClimateDT catalogs at are:\n['ci', 'climatedt-e26.1', 'climatedt-o25.1', 'climatedt-o26.1', 'climatedt-phase1', 'levante', 'lumi-phase2', 'mn5-eerie', 'mn5-phase2', 'nextgems3', 'nextgems4', 'nord4-eerie', 'obs', 'template']\n"

tests/test_console.py:558: AssertionError

To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.

@mcadau mcadau merged commit 42937f1 into v0.19-operational Mar 11, 2026
1 check failed
@mcadau mcadau deleted the v0.19-op-ecmean-fix branch March 11, 2026 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready to merge This PR is ready to merge in the opinion of the author v0.19-operational o26.1 operational release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants