From 74abb783fea79de9f06bf059c71d0b337bf5a4c6 Mon Sep 17 00:00:00 2001 From: Adrienne Stilp Date: Mon, 6 Jan 2025 16:11:21 -0800 Subject: [PATCH 1/4] Change requirements file to use interim version of ACM This will break the pip-compile CI because the SHA is different in the .txt and .in file. This is intended, as v0.28 of ACM is not released yet. We're testing it here. --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 9a6ba854..7700dcb0 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -52,7 +52,7 @@ django==4.2.17 # django-tables2 django-allauth==65.3.1 # via -r requirements/requirements.in -django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.27.0 +django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@12120e008e40d1771b574f66ab7534538cc4dc85 # via -r requirements/requirements.in django-autocomplete-light==3.11.0 # via django-anvil-consortium-manager From e838358d7166ae7aec41c1aa89e61b8cdb0e707a Mon Sep 17 00:00:00 2001 From: Adrienne Stilp Date: Mon, 6 Jan 2025 16:43:01 -0800 Subject: [PATCH 2/4] Add the new auditor app to the settings file --- config/settings/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/config/settings/base.py b/config/settings/base.py index 8895bb68..42925c71 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -91,6 +91,7 @@ LOCAL_APPS = [ "anvil_consortium_manager", + "anvil_consortium_manager.auditor", "gregor_django.users.apps.UsersConfig", # Your stuff: custom apps go here "gregor_django.drupal_oauth_provider", From f3eb979eb1d8042f887289d0111361d506b09f0e Mon Sep 17 00:00:00 2001 From: Adrienne Stilp Date: Mon, 6 Jan 2025 16:53:48 -0800 Subject: [PATCH 3/4] Update ACM version in requirements.in file --- requirements/requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.in b/requirements/requirements.in index c4ffc4e6..eb73ba3f 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -35,7 +35,7 @@ django-extensions # https://github.com/django-extensions/django-extensions # Bootstrap5 templates for crispy-forms crispy-bootstrap5 # https://github.com/django-crispy-forms/crispy-bootstrap5 -django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.27.0 +django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.28 # Simple history - model history tracking django-simple-history From dfaef072a0368be8b618836ffd299ef23262e827 Mon Sep 17 00:00:00 2001 From: amstilp <3944584+amstilp@users.noreply.github.com> Date: Tue, 7 Jan 2025 00:55:10 +0000 Subject: [PATCH 4/4] Compile requirements files --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 7700dcb0..edf485e1 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -52,7 +52,7 @@ django==4.2.17 # django-tables2 django-allauth==65.3.1 # via -r requirements/requirements.in -django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@12120e008e40d1771b574f66ab7534538cc4dc85 +django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.28 # via -r requirements/requirements.in django-autocomplete-light==3.11.0 # via django-anvil-consortium-manager