[CR][ENG-5997] merge develop into b-and-i branch #10691
Merged
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
- 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.
…-into-b-and-i * Merge in develop, which includes changes from the python 3.12 upgrade
brianjgeiger
approved these changes
Jul 30, 2024
brianjgeiger
merged commit c63042b
into
CenterForOpenScience:feature/b-and-i-24-14
6 checks passed
uditijmehta
pushed a commit
to uditijmehta/osf.io
that referenced
this pull request
Aug 9, 2024
…e#10691) ## Purpose Bring `feature/b-and-i-24-14` up to date with `develop` (and the upgrade to python v3.12) ## Changes * Some small conflict resolutions * One change to make a `.format()` string an f-string ## QA Notes This may merit a retesting, but I have reviewed the changes in the branch and they all seem pretty compatible with the py3.12 updates. ## Documentation No documentation changes needed. ## Side Effects Devs will need to update their envs for the new py3.12 base. That'll involve pulling images, rebuilding requirements, and maybe something else? ## Ticket https://openscience.atlassian.net/browse/ENG-5997
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
Aug 13, 2024
…penScience/osf.io into fix-source-tags * 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io: refactor handle_duplicate_notifications and add tests Shorten lines; rename script for test clarity fix flake8 errors add admin screen to manage duplicate notifications [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660) [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691) add exception handling in case state doesn't change [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678) restrict state changes more and allow no-ops split apart change provider views from general preprint view and machine_state change viewa Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671) [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662) # Conflicts: # addons/boa/requirements.txt # addons/box/requirements.txt # addons/dataverse/requirements.txt # addons/dropbox/requirements.txt # addons/github/requirements.txt # addons/gitlab/requirements.txt # addons/mendeley/requirements.txt # addons/owncloud/requirements.txt # addons/s3/requirements.txt # addons/twofactor/requirements.txt # addons/wiki/requirements.txt # addons/zotero/requirements.txt # api/base/utils.py # api/users/serializers.py # api_tests/draft_registrations/views/test_draft_registration_list.py # api_tests/nodes/views/test_node_draft_registration_list.py # api_tests/users/views/test_user_draft_registration_list.py # api_tests/users/views/test_user_settings.py # docker-compose.yml # poetry.lock # pyproject.toml # requirements.txt # requirements/dev.txt # requirements/release.txt # tests/test_views.py # website/util/metrics.py
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
Aug 13, 2024
…penScience/osf.io into fix-source-tags * 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io: refactor handle_duplicate_notifications and add tests Shorten lines; rename script for test clarity fix flake8 errors add admin screen to manage duplicate notifications [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660) [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691) add exception handling in case state doesn't change [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678) restrict state changes more and allow no-ops split apart change provider views from general preprint view and machine_state change viewa Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671) [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662) # Conflicts: # addons/boa/requirements.txt # addons/box/requirements.txt # addons/dataverse/requirements.txt # addons/dropbox/requirements.txt # addons/github/requirements.txt # addons/gitlab/requirements.txt # addons/mendeley/requirements.txt # addons/owncloud/requirements.txt # addons/s3/requirements.txt # addons/twofactor/requirements.txt # addons/wiki/requirements.txt # addons/zotero/requirements.txt # api/base/utils.py # api/users/serializers.py # api_tests/draft_registrations/views/test_draft_registration_list.py # api_tests/nodes/views/test_node_draft_registration_list.py # api_tests/users/views/test_user_draft_registration_list.py # api_tests/users/views/test_user_settings.py # docker-compose.yml # poetry.lock # pyproject.toml # requirements.txt # requirements/dev.txt # requirements/release.txt # tests/test_views.py # website/util/metrics.py
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
Aug 13, 2024
…penScience/osf.io into fix-source-tags * 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io: refactor handle_duplicate_notifications and add tests Shorten lines; rename script for test clarity fix flake8 errors add admin screen to manage duplicate notifications [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660) [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691) add exception handling in case state doesn't change [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678) restrict state changes more and allow no-ops split apart change provider views from general preprint view and machine_state change viewa Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671) [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662) # Conflicts: # addons/boa/requirements.txt # addons/box/requirements.txt # addons/dataverse/requirements.txt # addons/dropbox/requirements.txt # addons/github/requirements.txt # addons/gitlab/requirements.txt # addons/mendeley/requirements.txt # addons/owncloud/requirements.txt # addons/s3/requirements.txt # addons/twofactor/requirements.txt # addons/wiki/requirements.txt # addons/zotero/requirements.txt # api/base/utils.py # api/users/serializers.py # api_tests/draft_registrations/views/test_draft_registration_list.py # api_tests/nodes/views/test_node_draft_registration_list.py # api_tests/users/views/test_user_draft_registration_list.py # api_tests/users/views/test_user_settings.py # docker-compose.yml # poetry.lock # pyproject.toml # requirements.txt # requirements/dev.txt # requirements/release.txt # tests/test_views.py # website/util/metrics.py
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
Aug 21, 2024
…penScience/osf.io into fix-preprint-emails * 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io: Make resubmissions more like submissions (CenterForOpenScience#10709) renamed files with travis in their names fixed case where it was more appropriate removed all travis mentions and replaced them with CI [ENG-2562] add system tags to users created via institutional sign up system (CenterForOpenScience#10696) refactor handle_duplicate_notifications and add tests Shorten lines; rename script for test clarity fix flake8 errors add admin screen to manage duplicate notifications [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660) [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691) add exception handling in case state doesn't change [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678) restrict state changes more and allow no-ops split apart change provider views from general preprint view and machine_state change viewa Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671) [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662) # Conflicts: # osf/utils/notifications.py # website/templates/emails/reviews_resubmission_confirmation.html.mako
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
Aug 21, 2024
…penScience/osf.io into fix-preprint-emails * 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io: Make resubmissions more like submissions (CenterForOpenScience#10709) renamed files with travis in their names fixed case where it was more appropriate removed all travis mentions and replaced them with CI [ENG-2562] add system tags to users created via institutional sign up system (CenterForOpenScience#10696) refactor handle_duplicate_notifications and add tests Shorten lines; rename script for test clarity fix flake8 errors add admin screen to manage duplicate notifications [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660) [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691) add exception handling in case state doesn't change [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678) restrict state changes more and allow no-ops split apart change provider views from general preprint view and machine_state change viewa Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671) [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662) # Conflicts: # osf/utils/notifications.py # website/templates/emails/reviews_resubmission_confirmation.html.mako
uditijmehta
pushed a commit
to uditijmehta/osf.io
that referenced
this pull request
Oct 4, 2024
…e#10691) Bring `feature/b-and-i-24-14` up to date with `develop` (and the upgrade to python v3.12) * Some small conflict resolutions * One change to make a `.format()` string an f-string This may merit a retesting, but I have reviewed the changes in the branch and they all seem pretty compatible with the py3.12 updates. No documentation changes needed. Devs will need to update their envs for the new py3.12 base. That'll involve pulling images, rebuilding requirements, and maybe something else? https://openscience.atlassian.net/browse/ENG-5997
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
Bring
feature/b-and-i-24-14up to date withdevelop(and the upgrade to python v3.12)Changes
.format()string an f-stringQA Notes
This may merit a retesting, but I have reviewed the changes in the branch and they all seem pretty compatible with the py3.12 updates.
Documentation
No documentation changes needed.
Side Effects
Devs will need to update their envs for the new py3.12 base. That'll involve pulling images, rebuilding requirements, and maybe something else?
Ticket
https://openscience.atlassian.net/browse/ENG-5997