Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: icatproject/python-icat
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: icatproject/python-icat
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: relation-sample-investigation
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 19 commits
  • 26 files changed
  • 1 contributor

Commits on Jan 29, 2024

  1. Adapt example scripts to the case that InvestigationSample is in the 

    schema, e.g. the relation between sample and investigation is
many-to-many
    @RKrahl
    RKrahl committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    ff2fc2c View commit details
    Browse the repository at this point in the history

  2. Adapt icatdump and icatingest to the case that InvestigationSample is 

    in the schema, e.g. the relation between sample and investigation is
many-to-many
    @RKrahl
    RKrahl committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    d01ecaf View commit details
    Browse the repository at this point in the history

  3. Add example dumpfile and test reference data for the case that 

    InvestigationSample is in the schema, e.g. the relation between sample
and investigation is many-to-many
    @RKrahl
    RKrahl committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    d6c3983 View commit details
    Browse the repository at this point in the history

  4. Skip test_05_legacy_ingest.py with newer ICAT versions

    @RKrahl
    RKrahl committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    9887b3e View commit details
    Browse the repository at this point in the history

  5. Fixup d01ecaf: also need to adapt the internal function icatdump() 

    used in test_05_dumpfile.py
    @RKrahl
    RKrahl committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    f8f87d0 View commit details
    Browse the repository at this point in the history

  6. Update number of rules in test_06_query.py

    @RKrahl
    RKrahl committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    e83b537 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Adapt test_06_icatingest.py to the case that InvestigationSample is in 

    the schema, e.g. the relation between sample and investigation is
many-to-many
    @RKrahl
    RKrahl committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    c8e81da View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ingest-env' into relation-sample-investigation

    @RKrahl
    RKrahl committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    0f4b6dd View commit details
    Browse the repository at this point in the history

  3. Add icatdata-7.0.xsd

    @RKrahl
    RKrahl committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    fb2d071 View commit details
    Browse the repository at this point in the history

  4. Adapt test_06_ingest.py to the case that InvestigationSample is in the 

    schema, e.g. the relation between sample and investigation is
many-to-many.  Didn't adapt ingest.xslt yet though.
    @RKrahl
    RKrahl committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    ca67e91 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. - add an attribute sample_investigation_relation to the environment to 

      be injected into the IngestReader input, having either 'one' or
  'many' as value if the relation from Sample to Investigation is
  either many-to-one or many-to-many respectively
- use the sample_investigation_relation attribute in ingest.xslt in
  order to properly reference the Investigation from the Sample
    @RKrahl
    RKrahl committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    369bcdd View commit details
    Browse the repository at this point in the history

  2. Refactor the change in ingest.xslt from 369bcdd using an XSLT variable

    @RKrahl
    RKrahl committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    144016d View commit details
    Browse the repository at this point in the history

  3. Fix tests: the attribute pid has been added to Sample in ICAT 4.10 and 

    thus must not be set unconditionally
    @RKrahl
    RKrahl committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    83871b3 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Typo in test docstring

    @RKrahl
    RKrahl committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    0e7ee6f View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Start the development for the next major release

    @RKrahl
    RKrahl committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    b358006 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v2_0' into relation-sample-investigation

    @RKrahl
    RKrahl committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    6264f88 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Merge branch 'master' into relation-sample-investigation

    @RKrahl
    RKrahl committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    9c7d301 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2026

  1. Merge branch 'master' into relation-sample-investigation

    @RKrahl
    RKrahl committed Jan 12, 2026
    Configuration menu
    Copy the full SHA
    bf082bc View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2026

  1. Typo in docstring

    @RKrahl
    RKrahl committed Jan 29, 2026
    Configuration menu
    Copy the full SHA
    ecca525 View commit details
    Browse the repository at this point in the history
Loading