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.

Sign up for GitHub

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

Jump to bottom

[ENG-3868] Move blocked email domains to post-migrate signal #9958

Merged
merged 3 commits into from
Jul 13, 2022
Merged

[ENG-3868] Move blocked email domains to post-migrate signal #9958

merged 3 commits into from
Jul 13, 2022

Conversation

Johnetordoff
Copy link
Contributor

@Johnetordoff Johnetordoff commented Jun 18, 2022 •
edited
Loading

Purpose

This makes population of Blocked Email Domains a post-migration signal in preparation of the Django upgrade.

Changes

  • removes license migration from the migration stream
  • add new signal to populate migrations

QA Notes

Please make verification statements inspired by your code and what your code touches.

  • Verify
  • Verify

What are the areas of risk?

Any concerns/considerations/questions that development raised?

Documentation

Side Effects

Ticket

https://openscience.atlassian.net/browse/ENG-3868

@Johnetordoff Johnetordoff force-pushed the signal-deny-list branch 5 times, most recently from e7d5fb4 to e6e6d30 Compare June 19, 2022 21:14
@Johnetordoff Johnetordoff changed the title move blocked email domains to post-migrate signal [ENG-3868] Move blocked email domains to post-migrate signal Jun 20, 2022
jwalz
jwalz reviewed Jun 21, 2022
View reviewed changes
osf/migrations/__init__.py Outdated Show resolved Hide resolved
@Johnetordoff Johnetordoff changed the base branch from develop to feature/django_upgrade June 26, 2022 23:10
jwalz
jwalz reviewed Jun 27, 2022
View reviewed changes
Copy link
Contributor

@jwalz jwalz left a comment

Choose a reason for hiding this comment

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

Double check with Abram and Eric about default allow_list for emails (pull domains for institutions?)

@Johnetordoff Johnetordoff force-pushed the signal-deny-list branch 2 times, most recently from 6a7f83a to 578f0ce Compare June 27, 2022 20:13
@Johnetordoff Johnetordoff marked this pull request as ready for review July 6, 2022 14:52
cslzchen
cslzchen requested changes Jul 12, 2022
View reviewed changes
Copy link
Collaborator

@cslzchen cslzchen left a comment •
edited
Loading

Choose a reason for hiding this comment

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

As mentioned, need to revert the name from DENY_EMAIL_DOMAINS to BLACKLISTED_DOMAINS. The rest looks good! 🎆

And just re-surface @jwalz 's previous review, we need to create_or_update instead of using bulk_create since 1.11 doesn't have ignore_conflicts yet.

In addition, I am not sure if should use bulk_create with ignore_conflicts after the upgrade since we are updating the list after initial creation. May want to take a look at performance concerns if bulk_create is used to add only a few new items to a long list.

website/settings/defaults.py Outdated Show resolved Hide resolved
cslzchen
cslzchen approved these changes Jul 13, 2022
View reviewed changes
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.

Looks great! I will take care of the conflicts fix + doing some local test for the iterative domain update/create before merging. 🌟

@cslzchen cslzchen merged commit fc4c982 into CenterForOpenScience:feature/django_upgrade Jul 13, 2022
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Jul 14, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
4a3e8d1 
…OpenScience/osf.io into signal-subjects

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  Instrument the ORCiD SSO affiliation flow * Existing user with verified ORCiD ID * Existing user confirmation of linking ORCiD ID * New user confirmation of account creation with ORCiD ID
  Add a django command script to handle instn sso email domain changes
  Bump version and CHANGELOG

# Conflicts:
#	osf/apps.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Jul 14, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
7d93e52 
…OpenScience/osf.io into upguard-indexes

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)

# Conflicts:
#	osf/apps.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Jul 18, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
1c33a03 
…OpenScience/osf.io into signal-storage-region

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  Instrument the ORCiD SSO affiliation flow * Existing user with verified ORCiD ID * Existing user confirmation of linking ORCiD ID * New user confirmation of account creation with ORCiD ID
  Add a django command script to handle instn sso email domain changes
  Bump version and CHANGELOG

# Conflicts:
#	osf/apps.py
#	osf/migrations/__init__.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Jul 18, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
2229665 
…OpenScience/osf.io into signal-create-providers-2

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  Instrument the ORCiD SSO affiliation flow * Existing user with verified ORCiD ID * Existing user confirmation of linking ORCiD ID * New user confirmation of account creation with ORCiD ID
  Add a django command script to handle instn sso email domain changes
  Bump version and CHANGELOG

# Conflicts:
#	osf/apps.py
#	osf/migrations/__init__.py
#	osf_tests/test_registration_bulk_upload_parser.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Jul 18, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
5425e96 
…OpenScience/osf.io into signal-create-providers-2

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  Instrument the ORCiD SSO affiliation flow * Existing user with verified ORCiD ID * Existing user confirmation of linking ORCiD ID * New user confirmation of account creation with ORCiD ID
  Add a django command script to handle instn sso email domain changes
  Bump version and CHANGELOG

# Conflicts:
#	osf/apps.py
#	osf/migrations/__init__.py
#	osf_tests/test_registration_bulk_upload_parser.py
cslzchen pushed a commit to cslzchen/osf.io that referenced this pull request Jul 27, 2022
@Johnetordoff @cslzchen
[ENG-3868] Move blocked email domains to post-migrate signal (CenterF…
9827591 
…orOpenScience#9958)

* Fix signal and clean-up
* don't use bulk create until ignore_conflicts exsists
* allow BLACKLISTED_DOMAINS to be seamlessly overridden

Co-authored-by: John Tordoff <>
cslzchen pushed a commit that referenced this pull request Jul 27, 2022
@Johnetordoff @cslzchen
[ENG-3868] Move blocked email domains to post-migrate signal (#9958)
c2c5e4e 
* Fix signal and clean-up
* don't use bulk create until ignore_conflicts exsists
* allow BLACKLISTED_DOMAINS to be seamlessly overridden

Co-authored-by: John Tordoff <>
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Jul 27, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
f31cfc3 
…OpenScience/osf.io into upguard-indexes

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965)
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950)
  move createcachetable to post migrate signal (CenterForOpenScience#9944)
  remove post-migrate signals from migration stream (CenterForOpenScience#9964)
  [ENG-3898][ENG-3899]Model support for OutcomeArtifact update and delete (CenterForOpenScience#9989)
  Make OutcomeArtifact.identifier nullable (CenterForOpenScience#9986)
  [ENG-3894] Outcome models (CenterForOpenScience#9975)
  revert color picker to working version (CenterForOpenScience#9968)

# Conflicts:
#	api/base/settings/defaults.py
#	osf/migrations/0037_ensure_licenses.py
#	osf/migrations/0038_ensure_schemas.py
#	osf/migrations/0074_parse_citation_styles.py
#	osf/migrations/0077_ensure_schemas.py
#	osf/migrations/0078_ensure_schemas.py
#	osf/migrations/0080_ensure_schemas.py
#	osf/migrations/0083_add_ember_waffle_flags.py
#	osf/migrations/0095_add_url_to_licenses.py
#	osf/migrations/0095_ensure_licenses.py
#	osf/migrations/0096_ensure_schemas.py
#	osf/migrations/0099_add_default_storage_region.py
#	osf/migrations/0107_add_dependent_styles.py
#	osf/migrations/0112_ensure_schemas.py
#	osf/migrations/0121_remove_support_page_waffle_flag.py
#	osf/migrations/0121_remove_waffle_flags.py
#	osf/migrations/0135_user_settings_waffles.py
#	osf/migrations/0136_add_ember_auth_register_waffle_flag.py
#	osf/migrations/0136_preprint_node_divorce.py
#	osf/migrations/0137_transfer_preprint_service_permissions.py
#	osf/migrations/0138_ensure_subjects_and_providers.py
#	osf/migrations/0142_change_registration_schemas.py
#	osf/migrations/0142_remove_forks_flag.py
#	osf/migrations/0142_remove_waffle_analytics_flags.py
#	osf/migrations/0144_add_prereg_winddown_switches.py
#	osf/migrations/0147_blacklistedemaildomain.py
#	osf/migrations/0149_add_datacite_doi_switch.py
#	osf/migrations/0152_ensure_schemas.py
#	osf/migrations/0154_remove_ember_project_registrations_flag.py
#	osf/migrations/0156_create_cache_table.py
#	osf/migrations/0157_add_storage_usage_flag.py
#	osf/migrations/0162_post_migrate.py
#	osf/migrations/0167_auto_20190506_1556.py
#	osf/migrations/0170_ensure_schemas.py
#	osf/migrations/0172_ensure_schemas.py
#	osf/migrations/0173_ensure_schemas.py
#	osf/migrations/0174_add_ab_testing_home_page_version_b_flag.py
#	osf/migrations/0191_migrate_schemas_to_schemablocks.py
#	osf/migrations/0195_add_enable_chronos_waffle_flag.py
#	osf/migrations/0196_update_schemas.py
#	osf/migrations/0197_add_ab_testing_home_page_hero_text_version_b_flag.py
#	osf/migrations/0199_draft_node_permissions.py
#	osf/migrations/0201_add_egap_flag.py
#	osf/migrations/0204_ensure_schemas.py
#	osf/migrations/0207_ensure_schemas.py
#	osf/migrations/0207_update_schemas2.py
#	osf/migrations/0208_update_EGAP_schema.py
#	osf/migrations/0221_add_schemas.py
#	osf/migrations/0227_add_secondary_data.py
#	osf/migrations/__init__.py
#	osf_tests/test_registration_bulk_upload_parser.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Jul 27, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
1b84c4d 
…OpenScience/osf.io into upguard-indexes

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965)
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950)
  move createcachetable to post migrate signal (CenterForOpenScience#9944)
  remove post-migrate signals from migration stream (CenterForOpenScience#9964)
  [ENG-3898][ENG-3899]Model support for OutcomeArtifact update and delete (CenterForOpenScience#9989)
  Make OutcomeArtifact.identifier nullable (CenterForOpenScience#9986)
  [ENG-3894] Outcome models (CenterForOpenScience#9975)
  revert color picker to working version (CenterForOpenScience#9968)

# Conflicts:
#	api/base/settings/defaults.py
#	osf/migrations/0037_ensure_licenses.py
#	osf/migrations/0038_ensure_schemas.py
#	osf/migrations/0074_parse_citation_styles.py
#	osf/migrations/0077_ensure_schemas.py
#	osf/migrations/0078_ensure_schemas.py
#	osf/migrations/0080_ensure_schemas.py
#	osf/migrations/0083_add_ember_waffle_flags.py
#	osf/migrations/0095_add_url_to_licenses.py
#	osf/migrations/0095_ensure_licenses.py
#	osf/migrations/0096_ensure_schemas.py
#	osf/migrations/0099_add_default_storage_region.py
#	osf/migrations/0107_add_dependent_styles.py
#	osf/migrations/0112_ensure_schemas.py
#	osf/migrations/0121_remove_support_page_waffle_flag.py
#	osf/migrations/0121_remove_waffle_flags.py
#	osf/migrations/0135_user_settings_waffles.py
#	osf/migrations/0136_add_ember_auth_register_waffle_flag.py
#	osf/migrations/0136_preprint_node_divorce.py
#	osf/migrations/0137_transfer_preprint_service_permissions.py
#	osf/migrations/0138_ensure_subjects_and_providers.py
#	osf/migrations/0142_change_registration_schemas.py
#	osf/migrations/0142_remove_forks_flag.py
#	osf/migrations/0142_remove_waffle_analytics_flags.py
#	osf/migrations/0144_add_prereg_winddown_switches.py
#	osf/migrations/0147_blacklistedemaildomain.py
#	osf/migrations/0149_add_datacite_doi_switch.py
#	osf/migrations/0152_ensure_schemas.py
#	osf/migrations/0154_remove_ember_project_registrations_flag.py
#	osf/migrations/0156_create_cache_table.py
#	osf/migrations/0157_add_storage_usage_flag.py
#	osf/migrations/0162_post_migrate.py
#	osf/migrations/0167_auto_20190506_1556.py
#	osf/migrations/0170_ensure_schemas.py
#	osf/migrations/0172_ensure_schemas.py
#	osf/migrations/0173_ensure_schemas.py
#	osf/migrations/0174_add_ab_testing_home_page_version_b_flag.py
#	osf/migrations/0191_migrate_schemas_to_schemablocks.py
#	osf/migrations/0195_add_enable_chronos_waffle_flag.py
#	osf/migrations/0196_update_schemas.py
#	osf/migrations/0197_add_ab_testing_home_page_hero_text_version_b_flag.py
#	osf/migrations/0199_draft_node_permissions.py
#	osf/migrations/0201_add_egap_flag.py
#	osf/migrations/0204_ensure_schemas.py
#	osf/migrations/0207_ensure_schemas.py
#	osf/migrations/0207_update_schemas2.py
#	osf/migrations/0208_update_EGAP_schema.py
#	osf/migrations/0221_add_schemas.py
#	osf/migrations/0227_add_secondary_data.py
#	osf/migrations/__init__.py
#	osf_tests/test_registration_bulk_upload_parser.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Jul 27, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
483bbf0 
…OpenScience/osf.io into upguard-indexes

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965)
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950)
  move createcachetable to post migrate signal (CenterForOpenScience#9944)
  remove post-migrate signals from migration stream (CenterForOpenScience#9964)
  [ENG-3898][ENG-3899]Model support for OutcomeArtifact update and delete (CenterForOpenScience#9989)
  Make OutcomeArtifact.identifier nullable (CenterForOpenScience#9986)
  [ENG-3894] Outcome models (CenterForOpenScience#9975)
  revert color picker to working version (CenterForOpenScience#9968)

# Conflicts:
#	api/base/settings/defaults.py
#	osf/migrations/0037_ensure_licenses.py
#	osf/migrations/0038_ensure_schemas.py
#	osf/migrations/0074_parse_citation_styles.py
#	osf/migrations/0077_ensure_schemas.py
#	osf/migrations/0078_ensure_schemas.py
#	osf/migrations/0080_ensure_schemas.py
#	osf/migrations/0083_add_ember_waffle_flags.py
#	osf/migrations/0095_add_url_to_licenses.py
#	osf/migrations/0095_ensure_licenses.py
#	osf/migrations/0096_ensure_schemas.py
#	osf/migrations/0099_add_default_storage_region.py
#	osf/migrations/0107_add_dependent_styles.py
#	osf/migrations/0112_ensure_schemas.py
#	osf/migrations/0121_remove_support_page_waffle_flag.py
#	osf/migrations/0121_remove_waffle_flags.py
#	osf/migrations/0135_user_settings_waffles.py
#	osf/migrations/0136_add_ember_auth_register_waffle_flag.py
#	osf/migrations/0136_preprint_node_divorce.py
#	osf/migrations/0137_transfer_preprint_service_permissions.py
#	osf/migrations/0138_ensure_subjects_and_providers.py
#	osf/migrations/0142_change_registration_schemas.py
#	osf/migrations/0142_remove_forks_flag.py
#	osf/migrations/0142_remove_waffle_analytics_flags.py
#	osf/migrations/0144_add_prereg_winddown_switches.py
#	osf/migrations/0147_blacklistedemaildomain.py
#	osf/migrations/0149_add_datacite_doi_switch.py
#	osf/migrations/0152_ensure_schemas.py
#	osf/migrations/0154_remove_ember_project_registrations_flag.py
#	osf/migrations/0156_create_cache_table.py
#	osf/migrations/0157_add_storage_usage_flag.py
#	osf/migrations/0162_post_migrate.py
#	osf/migrations/0167_auto_20190506_1556.py
#	osf/migrations/0170_ensure_schemas.py
#	osf/migrations/0172_ensure_schemas.py
#	osf/migrations/0173_ensure_schemas.py
#	osf/migrations/0174_add_ab_testing_home_page_version_b_flag.py
#	osf/migrations/0191_migrate_schemas_to_schemablocks.py
#	osf/migrations/0195_add_enable_chronos_waffle_flag.py
#	osf/migrations/0196_update_schemas.py
#	osf/migrations/0197_add_ab_testing_home_page_hero_text_version_b_flag.py
#	osf/migrations/0199_draft_node_permissions.py
#	osf/migrations/0201_add_egap_flag.py
#	osf/migrations/0204_ensure_schemas.py
#	osf/migrations/0207_ensure_schemas.py
#	osf/migrations/0207_update_schemas2.py
#	osf/migrations/0208_update_EGAP_schema.py
#	osf/migrations/0221_add_schemas.py
#	osf/migrations/0227_add_secondary_data.py
#	osf/migrations/__init__.py
#	osf_tests/test_registration_bulk_upload_parser.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Jul 27, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
0660254 
…OpenScience/osf.io into signal-create-providers-2

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3836] Follow-up: Add PyYAML to Requirements (CenterForOpenScience#9993)
  [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965)
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950)
  move createcachetable to post migrate signal (CenterForOpenScience#9944)
  remove post-migrate signals from migration stream (CenterForOpenScience#9964)
  [ENG-3898][ENG-3899]Model support for OutcomeArtifact update and delete (CenterForOpenScience#9989)
  Make OutcomeArtifact.identifier nullable (CenterForOpenScience#9986)
  [ENG-3894] Outcome models (CenterForOpenScience#9975)
  revert color picker to working version (CenterForOpenScience#9968)

# Conflicts:
#	osf/apps.py
#	osf/migrations/__init__.py
#	osf_tests/test_registration_bulk_upload_parser.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Jul 28, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
75e5a09 
…OpenScience/osf.io into upgrade-import-paths

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3836] Follow-up: Add PyYAML to Requirements (CenterForOpenScience#9993)
  [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965)
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950)
  move createcachetable to post migrate signal (CenterForOpenScience#9944)
  remove post-migrate signals from migration stream (CenterForOpenScience#9964)
  [ENG-3898][ENG-3899]Model support for OutcomeArtifact update and delete (CenterForOpenScience#9989)
  Make OutcomeArtifact.identifier nullable (CenterForOpenScience#9986)
  [ENG-3894] Outcome models (CenterForOpenScience#9975)
  revert color picker to working version (CenterForOpenScience#9968)
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Jul 28, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
d00e268 
…OpenScience/osf.io into upgrade-markdown

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3836] Follow-up: Add PyYAML to Requirements (CenterForOpenScience#9993)
  [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965)
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950)
  move createcachetable to post migrate signal (CenterForOpenScience#9944)
  remove post-migrate signals from migration stream (CenterForOpenScience#9964)
  [ENG-3898][ENG-3899]Model support for OutcomeArtifact update and delete (CenterForOpenScience#9989)
  Make OutcomeArtifact.identifier nullable (CenterForOpenScience#9986)
  [ENG-3894] Outcome models (CenterForOpenScience#9975)
  revert color picker to working version (CenterForOpenScience#9968)
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Jul 28, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
92e9c2a 
…OpenScience/osf.io into upgrade-password-reset

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3836] Follow-up: Add PyYAML to Requirements (CenterForOpenScience#9993)
  [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965)
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950)
  move createcachetable to post migrate signal (CenterForOpenScience#9944)
  remove post-migrate signals from migration stream (CenterForOpenScience#9964)
  [ENG-3898][ENG-3899]Model support for OutcomeArtifact update and delete (CenterForOpenScience#9989)
  Make OutcomeArtifact.identifier nullable (CenterForOpenScience#9986)
  [ENG-3894] Outcome models (CenterForOpenScience#9975)
  revert color picker to working version (CenterForOpenScience#9968)
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Aug 3, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
89bfd0f 
…OpenScience/osf.io into django-3-with-django-include

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3862] Move post-migrate signal out of migration stream for default providers (CenterForOpenScience#9971)
  [ENG-3836] Follow-up: Add PyYAML to Requirements (CenterForOpenScience#9993)
  [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965)
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950)
  move createcachetable to post migrate signal (CenterForOpenScience#9944)
  remove post-migrate signals from migration stream (CenterForOpenScience#9964)
  [ENG-3898][ENG-3899]Model support for OutcomeArtifact update and delete (CenterForOpenScience#9989)
  Make OutcomeArtifact.identifier nullable (CenterForOpenScience#9986)
  [ENG-3894] Outcome models (CenterForOpenScience#9975)
  revert color picker to working version (CenterForOpenScience#9968)

# Conflicts:
#	api/base/settings/defaults.py
#	osf/apps.py
#	osf/migrations/0138_ensure_subjects_and_providers.py
#	osf/migrations/__init__.py
#	osf/models/provider.py
#	osf_tests/test_registration_bulk_upload_parser.py
#	website/settings/defaults.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Aug 3, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
bc7f3e1 
…OpenScience/osf.io into django-3-with-django-include

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3862] Move post-migrate signal out of migration stream for default providers (CenterForOpenScience#9971)
  [ENG-3836] Follow-up: Add PyYAML to Requirements (CenterForOpenScience#9993)
  [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965)
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950)
  move createcachetable to post migrate signal (CenterForOpenScience#9944)
  remove post-migrate signals from migration stream (CenterForOpenScience#9964)
  [ENG-3898][ENG-3899]Model support for OutcomeArtifact update and delete (CenterForOpenScience#9989)
  Make OutcomeArtifact.identifier nullable (CenterForOpenScience#9986)
  [ENG-3894] Outcome models (CenterForOpenScience#9975)
  revert color picker to working version (CenterForOpenScience#9968)

# Conflicts:
#	api/base/settings/defaults.py
#	osf/apps.py
#	osf/migrations/0138_ensure_subjects_and_providers.py
#	osf/migrations/__init__.py
#	osf/models/provider.py
#	osf_tests/test_registration_bulk_upload_parser.py
#	website/settings/defaults.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Aug 3, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
6a3c406 
…OpenScience/osf.io into django-3-with-django-include

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3862] Move post-migrate signal out of migration stream for default providers (CenterForOpenScience#9971)
  [ENG-3836] Follow-up: Add PyYAML to Requirements (CenterForOpenScience#9993)
  [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965)
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950)
  move createcachetable to post migrate signal (CenterForOpenScience#9944)
  remove post-migrate signals from migration stream (CenterForOpenScience#9964)
  [ENG-3898][ENG-3899]Model support for OutcomeArtifact update and delete (CenterForOpenScience#9989)
  Make OutcomeArtifact.identifier nullable (CenterForOpenScience#9986)
  [ENG-3894] Outcome models (CenterForOpenScience#9975)
  revert color picker to working version (CenterForOpenScience#9968)

# Conflicts:
#	api/base/settings/defaults.py
#	osf/apps.py
#	osf/migrations/0138_ensure_subjects_and_providers.py
#	osf/migrations/__init__.py
#	osf/models/provider.py
#	osf_tests/test_registration_bulk_upload_parser.py
#	website/settings/defaults.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Aug 4, 2022
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
7c845bb 
…OpenScience/osf.io into remove-django-debug-toolbar

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  [ENG-3862] Move post-migrate signal out of migration stream for default providers (CenterForOpenScience#9971)
  [ENG-3836] Follow-up: Add PyYAML to Requirements (CenterForOpenScience#9993)
  [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965)
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950)
  move createcachetable to post migrate signal (CenterForOpenScience#9944)
  remove post-migrate signals from migration stream (CenterForOpenScience#9964)
  [ENG-3898][ENG-3899]Model support for OutcomeArtifact update and delete (CenterForOpenScience#9989)
  Make OutcomeArtifact.identifier nullable (CenterForOpenScience#9986)
  [ENG-3894] Outcome models (CenterForOpenScience#9975)
  revert color picker to working version (CenterForOpenScience#9968)

# Conflicts:
#	osf/apps.py
#	osf/migrations/__init__.py
#	osf_tests/test_registration_bulk_upload_parser.py
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Aug 14, 2022
Merge branch 'upgrade-markdown' of https://github.com/johnetordoff/os…
f348b4d 
…f.io into django-3-upgrade

* 'upgrade-markdown' of https://github.com/johnetordoff/osf.io:
  upgrade markdown
  [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965)
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950)
  move createcachetable to post migrate signal (CenterForOpenScience#9944)
  remove post-migrate signals from migration stream (CenterForOpenScience#9964)
Johnetordoff pushed a commit to Johnetordoff/osf.io that referenced this pull request Aug 26, 2022
Merge branch 'upgrade-cors-django-3' of https://github.com/johnetordo…
adb8503 
…ff/osf.io into django-3-onmibus

* 'upgrade-cors-django-3' of https://github.com/johnetordoff/osf.io:
  upgrade CORS for Django 3
  [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965)
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950)
  move createcachetable to post migrate signal (CenterForOpenScience#9944)
  remove post-migrate signals from migration stream (CenterForOpenScience#9964)

# Conflicts:
#	admin/base/settings/defaults.py
#	api/base/settings/defaults.py
#	osf/apps.py
#	osf/migrations/0037_ensure_licenses.py
#	osf/migrations/0038_ensure_schemas.py
#	osf/migrations/0074_parse_citation_styles.py
#	osf/migrations/0077_ensure_schemas.py
#	osf/migrations/0078_ensure_schemas.py
#	osf/migrations/0080_ensure_schemas.py
#	osf/migrations/0083_add_ember_waffle_flags.py
#	osf/migrations/0095_add_url_to_licenses.py
#	osf/migrations/0095_ensure_licenses.py
#	osf/migrations/0096_ensure_schemas.py
#	osf/migrations/0099_add_default_storage_region.py
#	osf/migrations/0107_add_dependent_styles.py
#	osf/migrations/0112_ensure_schemas.py
#	osf/migrations/0121_remove_support_page_waffle_flag.py
#	osf/migrations/0121_remove_waffle_flags.py
#	osf/migrations/0135_user_settings_waffles.py
#	osf/migrations/0136_add_ember_auth_register_waffle_flag.py
#	osf/migrations/0136_preprint_node_divorce.py
#	osf/migrations/0137_transfer_preprint_service_permissions.py
#	osf/migrations/0138_ensure_subjects_and_providers.py
#	osf/migrations/0142_change_registration_schemas.py
#	osf/migrations/0142_remove_forks_flag.py
#	osf/migrations/0142_remove_waffle_analytics_flags.py
#	osf/migrations/0144_add_prereg_winddown_switches.py
#	osf/migrations/0147_blacklistedemaildomain.py
#	osf/migrations/0149_add_datacite_doi_switch.py
#	osf/migrations/0152_ensure_schemas.py
#	osf/migrations/0154_remove_ember_project_registrations_flag.py
#	osf/migrations/0156_create_cache_table.py
#	osf/migrations/0157_add_storage_usage_flag.py
#	osf/migrations/0162_post_migrate.py
#	osf/migrations/0167_auto_20190506_1556.py
#	osf/migrations/0170_ensure_schemas.py
#	osf/migrations/0172_ensure_schemas.py
#	osf/migrations/0173_ensure_schemas.py
#	osf/migrations/0174_add_ab_testing_home_page_version_b_flag.py
#	osf/migrations/0191_migrate_schemas_to_schemablocks.py
#	osf/migrations/0195_add_enable_chronos_waffle_flag.py
#	osf/migrations/0196_update_schemas.py
#	osf/migrations/0197_add_ab_testing_home_page_hero_text_version_b_flag.py
#	osf/migrations/0199_draft_node_permissions.py
#	osf/migrations/0201_add_egap_flag.py
#	osf/migrations/0204_ensure_schemas.py
#	osf/migrations/0207_ensure_schemas.py
#	osf/migrations/0207_update_schemas2.py
#	osf/migrations/0208_update_EGAP_schema.py
#	osf/migrations/0221_add_schemas.py
#	osf/migrations/0227_add_secondary_data.py
#	osf/migrations/__init__.py
#	osf_tests/test_registration_bulk_upload_parser.py
#	requirements.txt
cslzchen pushed a commit that referenced this pull request Sep 1, 2022
@Johnetordoff @cslzchen
[ENG-3868] Move blocked email domains to post-migrate signal (#9958)
4882cb5 
* Fix signal and clean-up
* don't use bulk create until ignore_conflicts exsists
* allow BLACKLISTED_DOMAINS to be seamlessly overridden

Co-authored-by: John Tordoff <>
cslzchen pushed a commit that referenced this pull request Sep 22, 2022
@Johnetordoff @cslzchen
[ENG-3868] Move blocked email domains to post-migrate signal (#9958)
90f5476 
* Fix signal and clean-up
* don't use bulk create until ignore_conflicts exsists
* allow BLACKLISTED_DOMAINS to be seamlessly overridden

Co-authored-by: John Tordoff <>
cslzchen pushed a commit that referenced this pull request Oct 20, 2022
@Johnetordoff @cslzchen
[ENG-3868] Move blocked email domains to post-migrate signal (#9958)
ae21c14 
* Fix signal and clean-up
* don't use bulk create until ignore_conflicts exsists
* allow BLACKLISTED_DOMAINS to be seamlessly overridden

Co-authored-by: John Tordoff <>
mfraezz pushed a commit that referenced this pull request Oct 21, 2022
@cslzchen @Johnetordoff @jwalz
[ENG-3651] Django3 Upgrade (#10078)
2896ff0 
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
Reviewers

@jwalz jwalz jwalz left review comments

@cslzchen cslzchen cslzchen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Johnetordoff @jwalz @cslzchen