This repository has been archived by the owner on Sep 16, 2022. It is now read-only.
CSCMETAX-61: [FIX] Try a fix to an error in initial data loading duri… #265
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ng travis deployment
junsk1
added a commit
that referenced
this pull request
Jun 4, 2018
commit d9db33c Merge: 71b3fc0 6d08730 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Mon Jun 4 10:28:22 2018 +0300 Merge pull request #271 from CSCfi/CSCMETAX-280 CSCMETAX-280:[FIX] proper handling of language field data. commit 6d08730 Merge: 70cb0ea 71b3fc0 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Mon Jun 4 10:05:03 2018 +0300 Merge branch 'test' into CSCMETAX-280 commit 70cb0ea Merge: 8106f62 3a4ffdf Author: jkesanie <joonas.kesaniemi@csc.fi> Date: Mon Jun 4 09:56:29 2018 +0300 Merge branch 'CSCMETAX-280' of github.com:CSCfi/metax-api into CSCMETAX-280 commit 8106f62 Author: jkesanie <joonas.kesaniemi@csc.fi> Date: Mon Jun 4 09:38:10 2018 +0300 CSCMETAX-280:[FIX] proper handling of language field data. commit 3a4ffdf Author: jkesanie <joonas.kesaniemi@csc.fi> Date: Mon Jun 4 09:38:10 2018 +0300 CSCMETAX-280:[FIX] proper handling of language field data. commit 71b3fc0 Merge: 7544057 4a7c1e5 Author: hannu40k <hannu40k@users.noreply.github.com> Date: Fri Jun 1 16:41:04 2018 +0300 Merge pull request #270 from CSCfi/CSCMETAX-280 CSCMETAX-280:[ADD] datacatalog harvesting commit 4a7c1e5 Merge: 71cf1e2 7544057 Author: hannu40k <hannu40k@users.noreply.github.com> Date: Fri Jun 1 16:27:48 2018 +0300 Merge branch 'test' into CSCMETAX-280 commit 71cf1e2 Author: jkesanie <joonas.kesaniemi@csc.fi> Date: Fri Jun 1 15:18:15 2018 +0300 CSCMETAX-280:[FIX] according to review comments. commit 73353bc Author: Joonas Kesäniemi <joonas.kesaniemi@csc.fi> Date: Fri Jun 1 12:35:38 2018 +0300 Update minimal_api.py commit 6fceb94 Author: jkesanie <joonas.kesaniemi@csc.fi> Date: Fri Jun 1 12:23:44 2018 +0300 CSCMETAX-280:[ADD] datacatalog harvesting commit 7544057 Merge: 619b05f a0a4177 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Fri Jun 1 10:01:59 2018 +0300 Merge pull request #269 from CSCfi/CSCMETAX-61-schema Etsim migration related schema changes (part2) commit a0a4177 Author: jkesanie <joonas.kesaniemi@csc.fi> Date: Fri Jun 1 08:37:59 2018 +0300 Etsim migration related schema changes (part2) commit 619b05f Merge: e630a33 5698ef8 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Thu May 31 09:53:05 2018 +0300 Merge pull request #268 from CSCfi/CSCMETAX-61-schema Schema changes required by the Etsin migration. commit 5698ef8 Author: jkesanie <joonas.kesaniemi@csc.fi> Date: Thu May 31 09:33:11 2018 +0300 Schema changes required by the Etsin migration. commit e630a33 Merge: 3cd96f4 68c329a Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Wed May 30 18:36:03 2018 +0300 Merge pull request #264 from CSCfi/CSCMETAX-394-remove-sensitive-data-in-oai-pmh CSCMETAX-394: [ADD] Remove sensitive fields (email, phone, telephone)… commit 68c329a Merge: f27ada1 3cd96f4 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Wed May 30 17:30:21 2018 +0300 Merge branch 'test' into CSCMETAX-394-remove-sensitive-data-in-oai-pmh commit 3cd96f4 Merge: 2e75cb6 840679f Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Wed May 30 17:00:43 2018 +0300 Merge pull request #267 from CSCfi/CSCMETAX-408-begin-storing-django-db-migration-files CSCMETAX-408: [ADD] Remove exclusion of migrations/ directory from .g… commit 840679f Merge: ac84393 2e75cb6 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Wed May 30 16:37:22 2018 +0300 Merge branch 'test' into CSCMETAX-408-begin-storing-django-db-migration-files commit ac84393 Author: Hannu Kamarainen <hannu.kamarainen@csc.fi> Date: Wed May 30 16:12:16 2018 +0300 CSCMETAX-408: [ADD] Remove exclusion of migrations/ directory from .gitignore. Generate first migration files. Fix .flake8 to ignore migrations/ directory since there are files that are autogenerated commit 2e75cb6 Merge: a7d893a 253f3f4 Author: hannu40k <hannu40k@users.noreply.github.com> Date: Wed May 30 14:38:18 2018 +0300 Merge pull request #265 from CSCfi/CSCMETAX-61-load-initial-data-fix CSCMETAX-61: [FIX] Try a fix to an error in initial data loading duri… commit 253f3f4 Author: Hannu Kamarainen <hannu.kamarainen@csc.fi> Date: Wed May 30 14:37:40 2018 +0300 CSCMETAX-61: [FIX] Try a fix to an error in initial data loading during travis deployment commit f27ada1 Author: Hannu Kamarainen <hannu.kamarainen@csc.fi> Date: Wed May 30 14:24:31 2018 +0300 CSCMETAX-394: [FIX] Uncomment the part that does the actual cleaning... In tests, search for known sensitive values instead of field names commit bb654a6 Author: Hannu Kamarainen <hannu.kamarainen@csc.fi> Date: Wed May 30 13:42:27 2018 +0300 CSCMETAX-394: [ADD] Remove sensitive fields (email, phone, telephone) from OAI-PMH api outputs commit a7d893a Merge: 92a4b96 d8fad2e Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Wed May 30 12:22:52 2018 +0300 Merge pull request #263 from CSCfi/CSCMETAX-395-add-fields-params-for-datasets-pid-files-api CSCMETAX-395: [FIX] Datasets api /datasets/pid/files now also support… commit d8fad2e Merge: 019542d 92a4b96 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Wed May 30 12:05:30 2018 +0300 Merge branch 'test' into CSCMETAX-395-add-fields-params-for-datasets-pid-files-api commit 92a4b96 Merge: 8a816a2 f8cec67 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Wed May 30 12:02:02 2018 +0300 Merge pull request #262 from CSCfi/CSCMETAX-400-allow-etsin-pid-override CSCMETAX-400: [ADD] Datasets api: Add query param ?migration_override… commit 019542d Author: Hannu Kamarainen <hannu.kamarainen@csc.fi> Date: Wed May 30 11:43:16 2018 +0300 CSCMETAX-395: [FIX] Datasets api /datasets/pid/files now also supports ?file_fields=x,y,z parameter commit f8cec67 Author: Hannu Kamarainen <hannu.kamarainen@csc.fi> Date: Tue May 29 16:08:17 2018 +0300 CSCMETAX-400: [ADD] Datasets api: Add query param ?migration_override=bool which enables passing a custom preferred_identifier when creating datasets commit 8a816a2 Merge: 224efb6 04348f4 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Tue May 29 13:53:10 2018 +0300 Merge pull request #261 from CSCfi/CSCMETAX-61-change-travis-deploy-user CSCMETAX-61: [REF] Change Travis deploy user commit 04348f4 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Tue May 29 13:43:43 2018 +0300 CSCMETAX-61: [REF] Change Travis deploy user commit 224efb6 Merge: a46bc27 daf89b4 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Tue May 29 12:25:43 2018 +0300 Merge pull request #260 from CSCfi/CSCMETAX-398-allow-file-uptade-from-0-to-n CSCMETAX-398: [ADD] Datasets api: Allow the first addition of files t… commit daf89b4 Author: Hannu Kamarainen <hannu.kamarainen@csc.fi> Date: Tue May 29 12:13:35 2018 +0300 CSCMETAX-398: [ADD] Datasets api: Allow the first addition of files to an empty dataset to occur without creating a new dataset version (update from 0 files to N files) commit a46bc27 Merge: 2fbcd7c 934f759 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Tue May 29 10:30:00 2018 +0300 Merge pull request #259 from CSCfi/CSCMETAX-407-metadata-owner-org-filter CSCMETAX-407: [ADD] Query parameter to filter datasets by field metad… commit 934f759 Author: Hannu Kamarainen <hannu.kamarainen@csc.fi> Date: Tue May 29 09:29:57 2018 +0300 CSCMETAX-407: [ADD] Query parameter to filter datasets by field metadata_owner_org commit 2fbcd7c Merge: be8d86c c535c71 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Mon May 28 17:33:49 2018 +0300 Merge pull request #258 from CSCfi/CSCMETAX-394-remove-sensitive-fields CSCMETAX-394: Remove sensitive fields from datasets apis commit c535c71 Author: Hannu Kamarainen <hannu.kamarainen@csc.fi> Date: Mon May 28 16:48:54 2018 +0300 CSCMETAX-61: [FIX] Restrict /datasets/pid/files from public commit 64a626e Author: Hannu Kamarainen <hannu.kamarainen@csc.fi> Date: Mon May 28 16:48:15 2018 +0300 CSCMETAX-394: [ADD] Remove sensitive fields from datasets apis commit be8d86c Merge: 2c1a726 679fa92 Author: hannu40k <hannu40k@users.noreply.github.com> Date: Mon May 28 15:04:03 2018 +0300 Merge pull request #257 from CSCfi/CSCMETAX-359-relation-entity-type-refdata CSCMETAX-359: [ADD] research_dataset.relation.entity.type value is au… commit 679fa92 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Mon May 28 14:54:04 2018 +0300 CSCMETAX-359: [ADD] research_dataset.relation.entity.type value is auto-populated from resource_type reference data, if given. Adjust test data and tests accordingly. commit 2c1a726 Merge: addf26c 0fc52cb Author: hannu40k <hannu40k@users.noreply.github.com> Date: Mon May 28 09:44:26 2018 +0300 Merge pull request #256 from CSCfi/CSCMETAX-401 CSCMETAX-401:[ADD] more data to the oai_dc metadataformat output commit 0fc52cb Merge: 34e23f5 addf26c Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Fri May 25 13:02:05 2018 +0300 Merge branch 'test' into CSCMETAX-401 commit addf26c Merge: 2968d16 863d154 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Fri May 25 13:01:38 2018 +0300 Merge pull request #255 from CSCfi/CSCMETAX-393-restrict-api-access CSCMETAX-393: [ADD] Restrict service access per api by reading app_config commit 34e23f5 Author: Joonas Kesäniemi <joonas.kesaniemi@csc.fi> Date: Fri May 25 12:53:36 2018 +0300 Update minimal_api.py commit 156f492 Author: jkesanie <joonas.kesaniemi@csc.fi> Date: Fri May 25 12:45:28 2018 +0300 CSCMETAX-401:[ADD] more data to the oai_dc metadataformat output commit 863d154 Author: Hannu Kamarainen <hannu.kamarainen@csc.fi> Date: Fri May 25 12:23:35 2018 +0300 CSCMETAX-393: [ADD] Add permission class ServicePermissions, which reads app_config and controls general read and write access for services per each api commit 779543b Author: Hannu Kamarainen <hannu.kamarainen@csc.fi> Date: Fri May 25 11:21:49 2018 +0300 CSCMETAX-61: [REF] Refactor modifying the Request object in CommonViewSet to be more sensible commit 2968d16 Merge: 900992d b82a9cb Author: hannu40k <hannu40k@users.noreply.github.com> Date: Thu May 24 13:19:21 2018 +0300 Merge pull request #253 from CSCfi/CSCMETAX-379 CSCMETAX-379:[ADD] special handling of syke datasets for urnresolver commit b82a9cb Author: Joonas Kesäniemi <joonas.kesaniemi@csc.fi> Date: Thu May 24 12:52:11 2018 +0300 Update syke.py commit 4c7b2cb Author: jkesanie <joonas.kesaniemi@csc.fi> Date: Thu May 24 12:47:00 2018 +0300 CSCMETAX-379:[ADD] special handling of syke datasets for urnresolver commit 900992d Merge: f5b31b3 8c2ab79 Author: hannu40k <hannu40k@users.noreply.github.com> Date: Tue May 22 10:24:26 2018 +0300 Merge pull request #252 from CSCfi/CSCMETAX-61-update-requirements CSCMETAX-61: [REF] Update requirements.txt. Brings about a warning ab… commit 8c2ab79 Author: Juha-Matti Lehtinen <junnu.lehtinen@gmail.com> Date: Tue May 22 10:10:16 2018 +0300 CSCMETAX-61: [REF] Update requirements.txt. Brings about a warning about gevent monkey-patching, but according to gevent/gevent#1016 should not affect since we do not import gevent in the code. commit f5b31b3 Merge: 82836c0 43f9fd3 Author: hannu40k <hannu40k@users.noreply.github.com> Date: Mon May 21 16:47:18 2018 +0300 Merge pull request #251 from CSCfi/CSCMETAX-37 Changed datacite output according to comments commit 43f9fd3 Author: jkesanie <joonas.kesaniemi@csc.fi> Date: Mon May 21 15:34:49 2018 +0300 Changed datacite output according to comments
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…ng travis deployment