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.

Sign up for GitHub

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

Jump to bottom

bump everything #1778

Merged
merged 39 commits into from
Apr 23, 2024
Merged

bump everything #1778

merged 39 commits into from
Apr 23, 2024

Commits on Feb 16, 2024

  1. Update cil recipes to use astra 2.1

    @gfardell
    gfardell committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    86d3df4 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. callback temp fix

    @gfardell
    gfardell committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    b13e7f6 View commit details
    Browse the repository at this point in the history

  2. tests: fix windows tempfile race

    @casperdcl
    casperdcl committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    79734b9 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Merge remote-tracking branch 'upstream/master' into astra_2.1

    @gfardell
    gfardell committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    52ab891 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/test-windows-tempfile-race' in… 

    …to astra_2.1
    @gfardell
    gfardell committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    63cdc2c View commit details
    Browse the repository at this point in the history

  3. changelog

    @gfardell
    gfardell committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    f7602ee View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into astra_2.1

    @gfardell
    gfardell authored Feb 20, 2024
    Configuration menu
    Copy the full SHA
    a092968 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. change back to conda-forge with cuda

    @gfardell
    gfardell committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    7a29e25 View commit details
    Browse the repository at this point in the history

  2. update readme

    @gfardell
    gfardell committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    20dcb83 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Merge branch 'master' into astra_2.1 

    Signed-off-by: Gemma Fardell <[email protected]>
    @gfardell
    gfardell authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    60b02e1 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Updated Dockerfile for new ASTRA version

    @gfardell
    gfardell committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    a660e40 View commit details
    Browse the repository at this point in the history

  2. Updated requirements to TIGRE 2.6

    @gfardell
    gfardell committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    c598a04 View commit details
    Browse the repository at this point in the history

  3. update recipe

    @gfardell
    gfardell committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    03ffdeb View commit details
    Browse the repository at this point in the history

  4. Update unittests for py3.12

    @gfardell
    gfardell committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    223adbd View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into tigre_2.6

    @gfardell
    gfardell authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    f1fce47 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. replace assertDictContainsSubset

    @gfardell
    gfardell committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    f71918b View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Merge branch 'master' into tigre_2.6

    @gfardell
    gfardell authored Apr 5, 2024
    Configuration menu
    Copy the full SHA
    66b90b5 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Update meta.yaml 

    and `__cuda` selector
    @gfardell
    gfardell authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    45872b0 View commit details
    Browse the repository at this point in the history

  2. Update meta.yaml 

    added astra packages for GPU and non-CPU systems. Loosened version constraints in optional dependencies.
    @gfardell
    gfardell authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    cf25d33 View commit details
    Browse the repository at this point in the history

  3. CI: drop CUDA ASTRA

    @casperdcl
    casperdcl committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    6287110 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. CI: drop TIGRE CPU

    @casperdcl
    casperdcl committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    e0a68ab View commit details
    Browse the repository at this point in the history

  2. docker: try -c nvidia

    @casperdcl
    casperdcl committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    e7e8a13 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. updates for CCPi-Regularisation version 24.0.0

    @paskino @casperdcl
    paskino authored and casperdcl committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    7f95463 View commit details
    Browse the repository at this point in the history

  2. add to changelog

    @paskino @casperdcl
    paskino authored and casperdcl committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    bdc55dd View commit details
    Browse the repository at this point in the history

  3. bump ccpi-regulariser

    @casperdcl
    casperdcl committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    fdc7a54 View commit details
    Browse the repository at this point in the history

  4. CI: bump python, numpy versions

    @casperdcl
    casperdcl committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    eb3649f View commit details
    Browse the repository at this point in the history

  5. Supress prints for 3D fdk calls

    @gfardell
    gfardell committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    2547db0 View commit details
    Browse the repository at this point in the history

  6. add versions, remove selector

    @gfardell
    gfardell committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    e06231a View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/py_np_variants_update' into rgl24

    @gfardell
    gfardell committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    3dc669a View commit details
    Browse the repository at this point in the history

  8. Merge branch 'astra_2.1' into bump-versions

    @casperdcl
    casperdcl committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    14305b1 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'tigre_2.6' into bump-versions

    @casperdcl
    casperdcl committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    da6c452 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'rgl24' into bump-versions

    @casperdcl
    casperdcl committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    2e6bf76 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Package for GPU tests

    @gfardell
    gfardell committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    3f7791c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'astra_2.1' into bump-versions

    @gfardell
    gfardell committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    b14be12 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into bump-versions 

    Signed-off-by: Gemma Fardell <[email protected]>
    @gfardell
    gfardell authored Apr 18, 2024
    Configuration menu
    Copy the full SHA
    96e87cf View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Update README.md 

    Signed-off-by: Gemma Fardell <[email protected]>
    @gfardell
    gfardell authored Apr 19, 2024
    Configuration menu
    Copy the full SHA
    788cbc3 View commit details
    Browse the repository at this point in the history

  2. Update cange log 

    Signed-off-by: Gemma Fardell <[email protected]>
    @gfardell
    gfardell authored Apr 19, 2024
    Configuration menu
    Copy the full SHA
    9dee8c2 View commit details
    Browse the repository at this point in the history

  3. Add python and numpy versions to readme and action docs

    @lauramurgatroyd
    lauramurgatroyd committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    d4a3b3b View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Update test_DataProcessor.py 

    force jenkins

Signed-off-by: Gemma Fardell <[email protected]>
    @gfardell
    gfardell authored Apr 22, 2024
    Configuration menu
    Copy the full SHA
    8f91c0e View commit details
    Browse the repository at this point in the history