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

Remove instrument_id from keep arg #74

Merged
merged 1 commit into from
Mar 17, 2023
Merged

Remove instrument_id from keep arg #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions docs/release-notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ Release notes
vYY.0M.MICRO (Unreleased)
-------------------------

Security
~~~~~~~~

Features
~~~~~~~~

Expand All @@ -29,6 +32,23 @@ Release notes
Stability, Maintainability, and Testing
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

v23.03.2 (2023-03-17)
---------------------

Bugfixes
~~~~~~~~

* Remove ``instrument_id`` from ``keep`` argument of :func:`scitacean.Dataset.derive`.
The instrument id is not allowed in derived datasets.

v23.03.1 (2023-03-16)
---------------------

Security
~~~~~~~~

* Hide user tokens in exceptions raised on HTTP connection failures.

v23.03.0 (2023-03-08)
---------------------

Expand Down
1 change: 0 additions & 1 deletion src/scitacean/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,6 @@ def derive(
*,
keep: Iterable[str] = (
"contact_email",
"instrument_id",
"investigator",
"orcid_of_owner",
"owner",
Expand Down
2 changes: 0 additions & 2 deletions tests/dataset_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,6 @@ def test_derive_default(initial):

assert derived.investigator == initial.investigator
assert derived.owner == initial.owner
assert derived.instrument_id == initial.instrument_id
assert derived.orcid_of_owner == initial.orcid_of_owner
assert derived.owner_email == initial.owner_email
assert derived.contact_email == initial.contact_email
Expand Down Expand Up @@ -382,7 +381,6 @@ def test_derive_keep_nothing(initial):

assert derived.investigator is None
assert derived.owner is None
assert derived.instrument_id is None
assert derived.name is None
assert derived.used_software is None
assert derived.number_of_files == 0
Expand Down