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

Merge nci modules #276

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

Merge nci modules #276

wants to merge 15 commits into from

Commits on Nov 16, 2023

  1. initial work

    Ariana Barzinpour committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    0c31644 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. remove need for dea-env module, move some pip packages to conda env

    Ariana Barzinpour committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    4f28d76 View commit details
    Browse the repository at this point in the history

  2. remove dea-env and dea_unstable

    Ariana Barzinpour committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    3b0d1af View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. use double quotes around python version

    Ariana Barzinpour committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    b2a32d6 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. update test script to not need full module path and test against note… 

    …books
    Ariana Barzinpour committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    649387e View commit details
    Browse the repository at this point in the history

  2. set tide modelling env var on module load

    Ariana Barzinpour committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    fad9ec5 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. add pytest-odc to requirements

    Ariana Barzinpour committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    c6141c8 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. fix bash syntax

    Ariana Barzinpour committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    d5fec89 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Merge branch 'develop' into merge_nci_modules

    @Ariana-B
    Ariana-B authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    9ecb1d2 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Merge remote-tracking branch 'origin/develop' into merge_nci_modules

    Ariana Barzinpour committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    6edb531 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. fix env vs reqs package listing

    Ariana Barzinpour committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    687cf05 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. use forked dive action, try with pytest 8.1.1

    Ariana Barzinpour committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    0605703 View commit details
    Browse the repository at this point in the history

  2. change dive action ver

    Ariana Barzinpour committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    5262eda View commit details
    Browse the repository at this point in the history

  3. actually fix dive action version this time

    Ariana Barzinpour committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    b97371d View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Merge branch 'develop' into merge_nci_modules

    @Ariana-B
    Ariana-B authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    8007cf1 View commit details
    Browse the repository at this point in the history