-
Notifications
You must be signed in to change notification settings - Fork 330
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.
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
Feature/gravy valet integration #10704
Merged
jwalz
merged 37 commits into
CenterForOpenScience:feature/gravy_valet_integration
from
adlius:feature/gravy_valet_integration
Aug 16, 2024
Merged
Feature/gravy valet integration #10704
jwalz
merged 37 commits into
CenterForOpenScience:feature/gravy_valet_integration
from
adlius:feature/gravy_valet_integration
Aug 16, 2024
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
* Add original_publication_citation to preprints model and serializer * Fix an issue where original_publication_citation was not updated * Add unit tests * Respond to CR: * Rename original_publication_citation to custom_publication_citation * Redo migration * Redo migrations * Update preprints to route to EOW * Remvoe the use of preprints_dir * Add self link and view for preprint subjects relationship (CenterForOpenScience#10619) * add self link and view for preprint subjects relationship * Fix permissions issue * Add required write scopes --------- Co-authored-by: Brian J. Geiger <[email protected]> * Get root_folder for preprints (CenterForOpenScience#10630) ## Purpose Make it so preprints api serialization has a root_folder ## Changes 1. Modify the view to get the root_folder in the case of preprints ## Side Effects Should only affect preprints ## Ticket https://openscience.atlassian.net/browse/ENG-5716 --------- Co-authored-by: Yuhuai Liu <[email protected]> Co-authored-by: Brian J. Geiger <[email protected]> Co-authored-by: Brian J. Geiger <[email protected]>
…rOpenScience#10650) * Prevent users from accessing files from withdrawn registrations via API and Waterbutler --------- Co-authored-by: Uditi Mehta <[email protected]> Co-authored-by: Uditi Mehta <[email protected]>
- Do not record download metrics for renders
- Bump base python version from py3.6 to py3.12. - Switch to using poetry for dependency management - Bump most (not all) dependencies to their maximum version as of mid-March. - Significantly update Dockerfile - Upgrade Django to v4.2 - Generate test summary reports in CI --------- Co-authored-by: Oleh Paduchak <[email protected]> Co-authored-by: Mariia Lychko <[email protected]> Co-authored-by: Longze Chen <[email protected]>
* There were a bunch of changes made to the dataverse python module to get it working with the upgraded OSF. Then we ignored them. Avenge this injustice! * Rerunning `poetry lock` pulled in a new major version of indirect dep `django-datetime-field`. Pin the old version, b/c that seems like it could be break-y. * Update OSF version declare in pyproject.toml * Regenerate lockfile. Please setuptools, don't hurt 'em!
* Update repository-based deps (those that pull from github.com) to use commitShas instead of branch names. Update in both pyproject.toml (for poetry) and *requirements.txt (for legacy installs).
* Update metrics reports to import `elasticsearch6_dsl` instead of `elasticsearch_dsl`. `django-elasticsearch-metrics` was updated to use the ESv6-pinned version of elasticsearch_dsl. Our code was using the `InnerDocs` class from the v8 version of es_dsl and expecting it to work with the v6 version of ALL THE OTHER CLASSES in es_dsl. Stop doing that! * Fun fact: sometimes making a big dumb error will succeed incorrectly instead of throwing an error. Existence is a burden. * BTW this makes the admin metrics report return *all* the data, not just *some* of the data.
…roject root (CenterForOpenScience#10697) ## Purpose Fix devenv setup for people who use virtualenv inside project root in conjuction with docker-compose ## Changes Changed mount for `docker-compose` `requirements` service
Squashed commit of the following: commit 4f6adce Merge: f3925d3 4edcf8b Author: Fitz Elliott <[email protected]> Date: Fri Aug 9 12:07:43 2024 -0400 Merge branch 'hotfix/flake-error' into hotfix/pyupgrade-hotfixes-2 commit 4edcf8b Author: Fitz Elliott <[email protected]> Date: Fri Aug 9 12:07:11 2024 -0400 flake error - remove unused import commit f3925d3 Merge: f79ea48 e7b5e4c Author: Fitz Elliott <[email protected]> Date: Thu Aug 8 01:53:00 2024 -0400 Merge branch 'hotfix/dep-bumps-2' into hotfix/pyupgrade-hotfixes-2 commit e7b5e4c Author: Fitz Elliott <[email protected]> Date: Thu Aug 8 01:52:29 2024 -0400 bump django dep commit d810142 Author: Fitz Elliott <[email protected]> Date: Thu Aug 8 01:48:58 2024 -0400 update latent transitive deps commit f79ea48 Merge: f3c5b99 8296391 Author: Fitz Elliott <[email protected]> Date: Thu Aug 8 01:28:50 2024 -0400 Merge branch 'hotfix/double-url-encoding' into hotfix/pyupgrade-hotfixes-2 [ENG-6055] Closes CenterForOpenScience#10694 commit 8296391 Author: Andriy Sheredko <[email protected]> Date: Fri Aug 2 16:23:52 2024 +0300 - ENG-6055 fix for double encoding files and not be able to download them commit f3c5b99 Merge: d2b27f0 2070b6e Author: Fitz Elliott <[email protected]> Date: Thu Aug 8 01:24:01 2024 -0400 Merge branch 'hotfix/dep-bumps' into hotfix/pyupgrade-hotfixes-2 * Bump deps for django & werkzeug commit 2070b6e Author: Fitz Elliott <[email protected]> Date: Fri Aug 2 21:30:52 2024 -0400 make gha workflow use pyproject.toml commit c5c0c8e Author: Fitz Elliott <[email protected]> Date: Fri Aug 2 21:20:39 2024 -0400 remove old requirements files & annotate poetry deps commit c9b2117 Author: Fitz Elliott <[email protected]> Date: Fri Aug 2 20:23:49 2024 -0400 bump werkzeug dep commit c5fd2f3 Author: Fitz Elliott <[email protected]> Date: Fri Aug 2 20:21:45 2024 -0400 bump django dep commit 0e4950e Author: Fitz Elliott <[email protected]> Date: Fri Aug 2 20:19:39 2024 -0400 update latent transitive deps
jwalz
merged commit Aug 16, 2024
5b2886f
into
CenterForOpenScience:feature/gravy_valet_integration
5 of 6 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Purpose
Changes
QA Notes
Please make verification statements inspired by your code and what your code touches.
What are the areas of risk?
Any concerns/considerations/questions that development raised?
Documentation
Side Effects
Ticket