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.

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

[Django Upgrade] [ENG-3947] Upgrade django-elasticsearch-metrics #10021

Conversation

Johnetordoff
Copy link
Contributor

@Johnetordoff Johnetordoff commented Aug 15, 2022

Purpose

Note: PR description added by reviewer.

Django 3.0 Removed private Python 2 compatibility APIs which includes the following change.

django.utils.six - Remove usage of this vendored library or switch to six.

We have in-house library django-elasticsearch-metrics that is affected. Here is the PR that updates the library.

Changes

Update requirements to ping to a PR commit. It will be updated post-release when the aforementioned PR is merged.

QA Notes

N/A

Documentation

N/A

Side Effects

N/A

Ticket

Part of https://openscience.atlassian.net/browse/ENG-3947

@Johnetordoff Johnetordoff changed the base branch from develop to feature/django_upgrade August 15, 2022 00:17
Copy link
Collaborator

@cslzchen cslzchen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🎆 ! I will update the PR description before merge.

requirements.txt Show resolved Hide resolved
@cslzchen cslzchen changed the title Upgrade es metric for django 3 [Django Upgrade] [ENG-3947] Upgrade django-elasticsearch-metrics Aug 16, 2022
@cslzchen cslzchen force-pushed the upgrade-es-metric-for-django-3 branch from 254be7c to 2fa06e5 Compare August 16, 2022 17:29
@cslzchen cslzchen merged commit 06f6fe9 into CenterForOpenScience:feature/django_upgrade Aug 17, 2022
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Aug 17, 2022
…OpenScience/osf.io into django-3-squash-only

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [Django Upgrade] Upgrade markdown and mdx_del_ins (CenterForOpenScience#9984)
  [Django Upgrade] Replace M2M direct assignment  (CenterForOpenScience#10010)
  [Django Upgrade] Upgrade django-elasticsearch-metrics (CenterForOpenScience#10021)
  [Django Upgrade] Fix one sub-query slicing issue (CenterForOpenScience#10012)
  Re-add non-anonymized fields removed in CenterForOpenScience#10009 (CenterForOpenScience#10022)
  Update shield logo for colorado (UC Boulder)
  Update description for maglab
  [ENG-3249] Improve registration anonymization (CenterForOpenScience#10009)
  "backport" artifact changes and swap schema_response.justification (CenterForOpenScience#10003)
  Add new instn purdue
  Ensure BitBucket token is string, not bytes
  Only redirect to cas if not logged in
  OSFI: Update Shared SSO and Add MagLab/FSU [ENG-3654]
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Aug 17, 2022
…OpenScience/osf.io into django-3-2

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [Django Upgrade] Upgrade markdown and mdx_del_ins (CenterForOpenScience#9984)
  [Django Upgrade] Replace M2M direct assignment  (CenterForOpenScience#10010)
  [Django Upgrade] Upgrade django-elasticsearch-metrics (CenterForOpenScience#10021)
  [Django Upgrade] Fix one sub-query slicing issue (CenterForOpenScience#10012)
cslzchen pushed a commit that referenced this pull request Sep 1, 2022
mfraezz pushed a commit that referenced this pull request Oct 21, 2022
PRs:
* remove post-migrate signals from migration stream (#9964)
* move createcachetable to post migrate signal (#9944)
* [ENG-3836] Investigate waffle flags (#9950)
* [ENG-3865] Create Licenses using post-migrate signal (#9961)
* [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (#9974)
* [ENG-3868] Move blocked email domains to post-migrate signal (#9958)
* [ENG-3866] Move citation style population out of migration stream (#9966)
* [ENG-3867] Create Storage Regions on post migration signal (#9965)
* [ENG-3836] Follow-up: Add PyYAML to Requirements (#9993)
* [ENG-3862] Move post-migrate signal out of migration stream for default providers (#9971)
* Remove unused password change view/route (#9985)
* Update import paths and fix deprecated modules for Django 3 (#9983)
* Update postgres backend and remove failover router for Django 3 (#10011)
* Move file metadata population to unit test fixtures (#9994)
* [Django Upgrade] Fix one sub-query slicing issue (#10012)
* [Django Upgrade] Upgrade django-elasticsearch-metrics (#10021)
* [Django Upgrade] Replace M2M direct assignment  (#10010)
* [Django Upgrade] Upgrade markdown and mdx_del_ins (#9984)
* [Django Upgrade] Move schema activeness/visibility update to pytest fixtures (#10029)

Commits:
* Remove osf migrations
* Remove addon migrations
* Init migrations - osf
* Init migrations - addons
* Fix migration for NotableEmailDomain
* Fix circular import with built-in admin migrations
* Add a RunSQL migration to update indexes
* Upgrade django to 3.2.15 (and related dependencies)
* Make fields defined on typedmodels subclasses nullable
* Add required on_delete=CASCADE (default) to FKs missing it
* Fix django CORS whitelist settings due to origin definition update
* Add/Enable missing templates and middlewares in api settings
* Comment out admin permissions that clash with built-in "view" ones
* Add migrations for django upgrade base fixes
* Fix system check warnings for django admin
* Fix django cache table creation
* Enable django.contrib.sessions.middleware.SessionMiddleware
* Use default truthy and falsy values from upgraded DRF 3.13.1
* Use JsonField from django.db.models and django.forms
* Fix session cookie encoding/decoding by using ensure_str()
* Use prefetch instead of Django include
* Fix CORS for ORIGINS_WHITELIST
* Rename auto generated migration for django3 upgrade fixes
* Remove QuickFile check from get_serializer_class for FileDetail view
* Add registration_schema to DraftRegistrationDetailSerializer
* Add id to DraftRegistrationDetailSerializer
* Fix middleware order and replace deprecated staticfiles with static
* Fix and rework from_db_value & to_python for EncryptedJSONField
* Fix admin login failure for django upgrade
* Wrap generated keen_read_key with ensure_str
* Clear cached storage region property when creating a new version
* Do not notify in set_password() when creating a test user
* Fix RegistrationFactory for django3 upgrade
* Remove unused update_version_metadata in file node and update tests
* Remove tests for django-include
* Remove EGAP backfill command and tests
* Set DEFAULT_AUTO_FIELD to django.db.models.AutoField (default value)
* Replace deprecated NullBooleanField + add migrations
* Replace deprecated url() with re_path() for api
* Replace deprecated url() with re_path() for admin
* Fix missing or insufficient permission test for admin preprints view
* Fix admin user view tests by using HTTP response headers object
* Fix duplicate view_node permissions in node and instn view tests
* Rework refresh_from_db() to reload GFKs
* Fix visible contributor query
* Fix handle_archive_fail and its tests
* Use a different schema to fix tests failure due to django3 upgrade
* Update URLs for URL Validation tests with Django 3
* Improve to_internal_value() in NodeRelationshipField
* Add alt fixtures to prevent both siblings & parent/child conflicts
* Fix linked_by_nodes in node related counts test
* Fix bugged NullBooleanField -> BooleanField migration
* Re-make migrations for django3 upgrade and merge them into one

Co-authored-by: Longze Chen <[email protected]>
Co-authored-by: John Tordoff <[email protected]>
Co-authored-by: Jon Walz <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants