Skip to content
This repository has been archived by the owner on Sep 16, 2022. It is now read-only.

Merge Stable to Master #672

Merged
merged 17 commits into from
Nov 1, 2020
Merged

Merge Stable to Master #672

merged 17 commits into from
Nov 1, 2020

Conversation

katrite
Copy link
Member

@katrite katrite commented Nov 1, 2020

No description provided.

genie9 and others added 17 commits October 19, 2020 15:21
…st server; exludes check for elasticsearch version in elasticsearh imports (#650)

Co-authored-by: genie9 <[email protected]>
* CSCFAIRMETA-491-File-format-version-cannot-be-empty
- Remove file format -field if its empty
- Add minLegnth of 1 for string field in schemas

* CSCFAIRMETA-491-File-format-version-cannot-be-empty
- Remove empty format_version from already existing records

* CSCFAIRMETA-491-File-format-version-cannot-be-empty
- Change migration file name to newer
- Dependabot is keeping our requirements
  up to date.
…s pip requirements updates and old requirements.txt is autogenerated by pip-compile. (#651)

More on subject https://wiki.eduuni.fi/pages/viewpage.action?pageId=43255106

Co-authored-by: genie9 <[email protected]>
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.9 to 1.25.11.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/master/CHANGES.rst)
- [Commits](urllib3/urllib3@1.25.9...1.25.11)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* CSCFAIRMETA-723: [ADD|REF] Updates models with new JSONField comming with django 3.1 version update

Co-authored-by: genie9 <[email protected]>
- Rename models/common/delete to models/common/remove
- Make models listen to renamed function
- Set some foreign keys to null on delete
* CSCFAIRMETA-676-cannot-delete-dataset
- Set next_draft on_delete = SET_NULL instead of DO_NOTHING
- Add tests

* CSCFAIRMETA-676-cannot-delete-dataset
- Repair test
* CSCFAIRMETA-760-Return-pids-instead-of-urns
- Replace urn with pid in return
- Describe new parameters in swagger

* CSCFAIRMETA-760-Return-pids-instead-of-urns
- Add test to check that pids and not urns are returned

* CSCFAIRMETA-760-Return-pids-instead-of-urns
- Add test to check api returns right files / datasets

* CSCFAIRMETA-760-Return-pids-instead-of-urns
- Remove unneccessary test
- Add test to both v1 and v2 side

Co-authored-by: Katri Tegel <[email protected]>
CSCFAIRMETA-772: [ADD] migration file to remove deprecated SYKE files

Co-authored-by: genie9 <[email protected]>
@katrite katrite merged commit 4796883 into master Nov 1, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants