Remove old django-heroku and scout-apm (#4836)

Author: frjo

hypha/settings/django.py

@@ -6,7 +6,6 @@
 
 # Application definition
 INSTALLED_APPS = [
-    "scout_apm.django",
     "hypha.cookieconsent",
     "hypha.images",
     "hypha.core.apps.CoreAppConfig",

hypha/settings/production.py

@@ -22,6 +22,4 @@
 # Heroku configuration.
 # Set ON_HEROKU to true in Config Vars or via cli 'heroku config:set ON_HEROKU=true'.
 if env.bool("ON_HEROKU", False):
-    import django_heroku
-
-    django_heroku.settings(locals())
+    ALLOWED_HOSTS = ["*"]

pyproject.toml

@@ -20,7 +20,6 @@ dependencies = [
     "django-file-form~=4.0.0",
     "django-filter==25.2",
     "django-formtools~=2.5.1",
-    "django-heroku~=0.3.1",
     "django-hijack~=3.7.6",
     "django-htmx~=1.27.0",
     "django-nh3~=0.2.1",
@@ -48,8 +47,7 @@ dependencies = [
     "pwned-passwords-django~=5.2.0",
     "python-docx~=1.2.0",
     "redis~=7.1.0",
-    "scout-apm~=3.5.2",
-    "sentry-sdk~=2.49.0",
+    "sentry-sdk~=2.59.0",
     "setuptools~=80.9.0",
     "social_auth_app_django~=5.7.0",
     "svglib==1.5.1",

requirements/dev.txt

@@ -28,7 +28,6 @@ asgiref==3.11.1 \
     #   django-browser-reload
     #   django-countries
     #   django-htmx
-    #   scout-apm
 asn1crypto==1.5.1 \
     --hash=sha256:13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c \
     --hash=sha256:db4e40728b728508912cbb3d44f19ce188f218e9eba635821bb4b68564f8fd67
@@ -120,7 +119,6 @@ certifi==2026.4.22 \
     #   httpcore
     #   httpx
     #   requests
-    #   scout-apm
     #   sentry-sdk
 cffi==2.0.0 ; platform_python_implementation != 'PyPy' \
     --hash=sha256:00bdf7acc5f795150faa6957054fbbca2439db2f775ce831222b66f192f03beb \
@@ -519,9 +517,7 @@ distlib==0.4.0 \
 dj-database-url==3.1.2 \
     --hash=sha256:544e015fee3efa5127a1eb1cca465f4ace578265b3671fe61d0ed7dbafb5ec8a \
     --hash=sha256:63c20e4bbaa51690dfd4c8d189521f6bf6bc9da9fcdb23d95d2ee8ee87f9ec62
-    # via
-    #   django-heroku
-    #   hypha
+    # via hypha
 django==5.2.14 \
     --hash=sha256:58a63ba841662e5c686b57ba1fec52ddd68c0b93bd96ac3029d55728f00bf8a2 \
     --hash=sha256:6f712143bd3064310d1f50fac859c3e9a274bdcfc9595339853be7779297fc76
@@ -536,7 +532,6 @@ django==5.2.14 \
     #   django-extensions
     #   django-filter
     #   django-formtools
-    #   django-heroku
     #   django-hijack
     #   django-htmx
     #   django-modelcluster
@@ -613,10 +608,6 @@ django-formtools==2.5.1 \
     # via
     #   django-two-factor-auth
     #   hypha
-django-heroku==0.3.1 \
-    --hash=sha256:2bc690aab89eedbe01311752320a9a12e7548e3b0ed102681acc5736a41a4762 \
-    --hash=sha256:6af4bc3ae4a9b55eaad6dbe5164918982d2762661aebc9f83d9fa49f6009514e
-    # via hypha
 django-hijack==3.7.8 \
     --hash=sha256:8967e4f4e528e0cc06b4f0829fbc1a55a493cc3ce8c0d088d51d9a40404a32de \
     --hash=sha256:f28afb2be24430e348b8887c2f04337b1b77b66a44e4a6cd3a40902926d9e5fb
@@ -1556,9 +1547,7 @@ psutil==7.2.2 \
     --hash=sha256:ed0cace939114f62738d808fdcecd4c869222507e266e574799e9c0faa17d486 \
     --hash=sha256:eed63d3b4d62449571547b60578c5b2c4bcccc5387148db46e0c2313dad0ee00 \
     --hash=sha256:fd04ef36b4a6d599bbdb225dd1d3f51e00105f6d48a28f006da7f9822f2606d8
-    # via
-    #   pytest-xdist
-    #   scout-apm
+    # via pytest-xdist
 psycopg==3.3.4 \
     --hash=sha256:b6bbc25ccf05c8fad3b061d9db2ef0909a555171b84b07f29458a447253d679a \
     --hash=sha256:e21207764952cff81b6b8bdacad9a3939f2793367fdac2987b3aac36a651b5bc
@@ -1620,14 +1609,6 @@ psycopg-binary==3.3.4 ; implementation_name != 'pypy' \
     --hash=sha256:fa1cbc10768a796c96d3243656016bf4e337c81c71097270bb7b0ad6210d9765 \
     --hash=sha256:fbd1d4ed566895ad2d3bf4ddfd8bae90026930ddf29df3b9d91d32c8c47866a7
     # via psycopg
-psycopg2==2.9.12 \
-    --hash=sha256:1dedb1c7a1d8552c4a6044c6b1c41a52e6a8e2d144af83eccac758076b1b7c15 \
-    --hash=sha256:2532c0cdc6ad18c9c35cd935cc3159712e14f05276a6d29a6435c52d24b840c1 \
-    --hash=sha256:3d23e684927d37b95cee9a943f6927b04ae2fdcd056fd0e2a30929ee89fee5a9 \
-    --hash=sha256:83d48e66e18c301d832e93c984a7bcbc0f4ac3bb79e2137e3bc335978c756dc0 \
-    --hash=sha256:a73d5513bfe929c56555006c7a9cc7ae6e4276aa99dd2b1e2544eb8bb54f8b23 \
-    --hash=sha256:d5fbe092315fb007c03544704e6d1e678a6c0378139d01cea433dc59edf041b4
-    # via django-heroku
 pwned-passwords-django==5.2.0 \
     --hash=sha256:a8666fb427479796ee9940e92df834a188ca7246905e4b9dc7be6248415ff5df \
     --hash=sha256:dfa7c4fc8879396b8304759260c5fb8b6055c07ed9241010e5bc319f195d5197
@@ -2071,61 +2052,9 @@ s3transfer==0.16.1 \
     --hash=sha256:61bcd00ccb83b21a0fe7e91a553fff9729d46c83b4e0106e7c314a733891f7c2 \
     --hash=sha256:8e424355754b9ccb32467bdc568edf55be82692ef2002d934b1311dbb3b9e524
     # via boto3
-scout-apm==3.5.3 \
-    --hash=sha256:00a1e0097c0434ce3128f96d33d9faa05c4176428e62a9fd902548595f2ea42f \
-    --hash=sha256:02879d53a72f12e973c8c18f5ca4e9d4bc5556868e901f71994485e3fc35a2bd \
-    --hash=sha256:0a6b4293b0f5e4c85dc7d7a109f02ea94ecc8203a96366c8a470f9d099c02e64 \
-    --hash=sha256:0e2f0ae70788c7ad126148b6d5c6e5274bf38ad6e6ef5a5db85cd021b337cc00 \
-    --hash=sha256:25fcd53b7ce9873d410778cf728c1d7588ff1fff646378ec233cc391baf0a658 \
-    --hash=sha256:2895a98cabe3164c2b2f77ddf63cef20583ae1c19ae5cefb41b8ad3644252742 \
-    --hash=sha256:325fb96baa619e24996b9dfe8291f81d63cfe1e3164e5daee698340cf776e47f \
-    --hash=sha256:333e71b14db7fcc12617aac825d6ba47c228def84ee123c3152be76b24d5e85f \
-    --hash=sha256:34de2552893aaeaa56a0c592f3ec052bb2e3f1d4abc804a0c356e5daaa90760a \
-    --hash=sha256:358992f60f3b4d798b834a574c22fac1484fce3c284b0bd0454705b89ea70ef4 \
-    --hash=sha256:38ef6f2b3ea14b965e5786f359bbde744fead999bb1adf3d0e30d301b32250f3 \
-    --hash=sha256:401968654fd45fbff9ea60b9fdff9963ca1a47ccde66ae520322024f53ad7faa \
-    --hash=sha256:44b1e56a9dea56bbda440afab7b0eebf49f7784cd0c5488f4980fb543c304106 \
-    --hash=sha256:46499451969493ee322cbcbcbceb873f471e0ba8efa16e697ec0f2d673db0613 \
-    --hash=sha256:467e015210ad0742c61a82f07a8e381940fdcfa82bf52f9178712492d309fbb2 \
-    --hash=sha256:48469b06f2666bb45fe2584516790135f827f3750406cd1aadd4f5d8c7e89704 \
-    --hash=sha256:487ecb2e75a95b65985f14d9e1eb89c9c68e312c7a39e1871fba424cd1d451fe \
-    --hash=sha256:4aaa7c3f94f99c9faacd173de67eba0d87026143a1a9155f26e986e2d9994454 \
-    --hash=sha256:4aad92a26354d33eaf60297f798c7d81ebb0b4997c9f93dbeb95e78f62930e9e \
-    --hash=sha256:4bf107cfee8cbaaa6f7bf861109a106f2cfcab39202eeedfea5e7bc89507657e \
-    --hash=sha256:4eeed2a144e307ae3e44124b74eddce84bd31b4dbcecca4518fba4d9dfa16d62 \
-    --hash=sha256:54e575e95f5f9a98c09598a092ec03fc8d7576907c53c5e20632a3f05e103479 \
-    --hash=sha256:585f1a8740f0f73ef7bbfef3911ff76bac3a4ab50237b7c4b2791985ffc8cd67 \
-    --hash=sha256:5ab4194d02925e2b63d1646e74366983a831fae392af96392efefd68a335ebcb \
-    --hash=sha256:5e95f927e89da09045fbe2bd8621ff34042f15cd1ff62511ab5e73c580d53039 \
-    --hash=sha256:6dc12e32fad5ad31afef34fd86e95c9cec1674efe090fe45921868d88fe879f2 \
-    --hash=sha256:71b186b8789a54baa0671504533b498185c3817014f44ebc54f02af9643d5d12 \
-    --hash=sha256:7b7e612c1d0d59cb6dda77e50e5f6c0ee0cee2c6e39f60595d99875c2cf23039 \
-    --hash=sha256:80412c85cafc7a198b58f4070e5aebfcb15d9b9ffb2ecad0f23fcb3c0bbdca4a \
-    --hash=sha256:9b9093318c0317ca68c8ebaa785817ccee7b6b16e8ba1dbe6bc4c096e9186dbe \
-    --hash=sha256:a581451cfbc4355356debd466f1056f70f087b8e8f1571102e7f576b03b5aade \
-    --hash=sha256:a734712c08420c0c8b18cf9948ec86e5c55c123913c65a2bd8c81de6a0705aa2 \
-    --hash=sha256:aae948a6b19d6c4876a003a4aa60187270908d2b2655ea894663dd2dfda60e2e \
-    --hash=sha256:b75ec4d98eae56c26274cfe3bbcf289bb54b7e39f71dc7d29eae2b369eff647f \
-    --hash=sha256:b7817cb761c4338328fa32f3dad0b27c3d9c33118af310beedcad16981624cef \
-    --hash=sha256:b7d0d7726555cede8c8c05925e469490d00e8a3373deae05bb9678ab94bbfc84 \
-    --hash=sha256:c5788cb9e442eaa6bcf64720aec8d75fc8e6c61f9a253fdab8cf90b1e2150ac1 \
-    --hash=sha256:c83cffd020f27635ae6db7eeeb0e97128cebb241bc11ed1f6d792a128e89a46f \
-    --hash=sha256:d24597db8b4de736f41d0154c994804a034adfb4c3362c6f760c95a09df496b4 \
-    --hash=sha256:d448461aa667545bfbc325322c4a970bdd950227b2a800c51c78ee67b9567625 \
-    --hash=sha256:d7a9fa333dad7b2e705459d09c03b32d9e5e55e5957b64a178ebc6879f0e3c0d \
-    --hash=sha256:d9aad144cf69598cacf1cff7465232cc027ef52c61fe213589dc7137e5c519ee \
-    --hash=sha256:da5931c90decdf620ebaf7ab9325433e376d30fcdc3a74cea97f6fd26ac51085 \
-    --hash=sha256:daf9f923cd39c7624614765a171f2aebdb544297e91fe3b08dece29c40a4d569 \
-    --hash=sha256:ded3600ac043f18f588bb81a317a8d16e3f43fc2d85cda5aca4cf0639e8ecbdb \
-    --hash=sha256:e486afff5afafd88e47335f0e63c870d8d8ce44f3c0b7a9bf770bc62c18e05aa \
-    --hash=sha256:e837995b7fdb9cda1d619db152c097e1d54caa2636039727ce5a2d49ef99d87a \
-    --hash=sha256:ee020edb6fcf7f4f6aee6d7609f69b50164bdaed5d383109147f79a94786e253 \
-    --hash=sha256:ee22924f24ea9247cb8dceb11b76c6f46b0336bac91fb2483aa1e0cbf2db7e3e \
-    --hash=sha256:fd7c8b22dcdc23acb0f7fe5fe42edce46b5875219a30925ad9a60a172a89d1cb
-    # via hypha
-sentry-sdk==2.49.0 \
-    --hash=sha256:6ea78499133874445a20fe9c826c9e960070abeb7ae0cdf930314ab16bb97aa0 \
-    --hash=sha256:c1878599cde410d481c04ef50ee3aedd4f600e4d0d253f4763041e468b332c30
+sentry-sdk==2.59.0 \
+    --hash=sha256:abcf65ee9a9d9cdebf9ad369782408ecca9c1c792686ef06ba34f5ab233527fe \
+    --hash=sha256:cd265808ef8bf3f3edf69b527c0a0b2b6b1322762679e55b8987db2e9584aec1
     # via hypha
 setuptools==80.9.0 \
     --hash=sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922 \
@@ -2387,7 +2316,6 @@ urllib3==2.6.3 \
     #   django-anymail
     #   requests
     #   responses
-    #   scout-apm
     #   sentry-sdk
 vine==5.1.0 \
     --hash=sha256:40fdf3c48b2cfe1c38a49e9ae2da6fda88e4794c810050a728bd7413811fb1dc \
@@ -2464,77 +2392,11 @@ werkzeug==3.1.8 \
 whitenoise==6.11.0 \
     --hash=sha256:0f5bfce6061ae6611cd9396a8231e088722e4fc67bc13a111be74c738d99375f \
     --hash=sha256:b2aeb45950597236f53b5342b3121c5de69c8da0109362aee506ce88e022d258
-    # via
-    #   django-heroku
-    #   hypha
+    # via hypha
 willow==1.12.0 \
     --hash=sha256:d3541690b6726a4f6f4654f80507d81bacfa0c686ab065eb5c90159f1b9cee38 \
     --hash=sha256:db29c8d2f19b9d91f4ce22881521055aa2f6070131d64b4098cb86a98e851a70
     # via wagtail
-wrapt==1.17.3 \
-    --hash=sha256:042ec3bb8f319c147b1301f2393bc19dba6e176b7da446853406d041c36c7828 \
-    --hash=sha256:0610b46293c59a3adbae3dee552b648b984176f8562ee0dba099a56cfbe4df1f \
-    --hash=sha256:0b02e424deef65c9f7326d8c19220a2c9040c51dc165cddb732f16198c168396 \
-    --hash=sha256:0b1831115c97f0663cb77aa27d381237e73ad4f721391a9bfb2fe8bc25fa6e77 \
-    --hash=sha256:0ed61b7c2d49cee3c027372df5809a59d60cf1b6c2f81ee980a091f3afed6a2d \
-    --hash=sha256:16ecf15d6af39246fe33e507105d67e4b81d8f8d2c6598ff7e3ca1b8a37213f7 \
-    --hash=sha256:1f0b2f40cf341ee8cc1a97d51ff50dddb9fcc73241b9143ec74b30fc4f44f6cb \
-    --hash=sha256:223db574bb38637e8230eb14b185565023ab624474df94d2af18f1cdb625216f \
-    --hash=sha256:249f88ed15503f6492a71f01442abddd73856a0032ae860de6d75ca62eed8067 \
-    --hash=sha256:273a736c4645e63ac582c60a56b0acb529ef07f78e08dc6bfadf6a46b19c0da7 \
-    --hash=sha256:281262213373b6d5e4bb4353bc36d1ba4084e6d6b5d242863721ef2bf2c2930b \
-    --hash=sha256:33486899acd2d7d3066156b03465b949da3fd41a5da6e394ec49d271baefcf05 \
-    --hash=sha256:343e44b2a8e60e06a7e0d29c1671a0d9951f59174f3709962b5143f60a2a98bd \
-    --hash=sha256:373342dd05b1d07d752cecbec0c41817231f29f3a89aa8b8843f7b95992ed0c7 \
-    --hash=sha256:3af60380ba0b7b5aeb329bc4e402acd25bd877e98b3727b0135cb5c2efdaefe9 \
-    --hash=sha256:41b1d2bc74c2cac6f9074df52b2efbef2b30bdfe5f40cb78f8ca22963bc62977 \
-    --hash=sha256:423ed5420ad5f5529db9ce89eac09c8a2f97da18eb1c870237e84c5a5c2d60aa \
-    --hash=sha256:4da9f45279fff3543c371d5ababc57a0384f70be244de7759c85a7f989cb4ebe \
-    --hash=sha256:507553480670cab08a800b9463bdb881b2edeed77dc677b0a5915e6106e91a58 \
-    --hash=sha256:53e5e39ff71b3fc484df8a522c933ea2b7cdd0d5d15ae82e5b23fde87d44cbd8 \
-    --hash=sha256:54a30837587c6ee3cd1a4d1c2ec5d24e77984d44e2f34547e2323ddb4e22eb77 \
-    --hash=sha256:5531d911795e3f935a9c23eb1c8c03c211661a5060aab167065896bbf62a5f85 \
-    --hash=sha256:5a03a38adec8066d5a37bea22f2ba6bbf39fcdefbe2d91419ab864c3fb515454 \
-    --hash=sha256:5a7b3c1ee8265eb4c8f1b7d29943f195c00673f5ab60c192eba2d4a7eae5f46a \
-    --hash=sha256:5d4478d72eb61c36e5b446e375bbc49ed002430d17cdec3cecb36993398e1a9e \
-    --hash=sha256:5ea5eb3c0c071862997d6f3e02af1d055f381b1d25b286b9d6644b79db77657c \
-    --hash=sha256:604d076c55e2fdd4c1c03d06dc1a31b95130010517b5019db15365ec4a405fc6 \
-    --hash=sha256:6b538e31eca1a7ea4605e44f81a48aa24c4632a277431a6ed3f328835901f4fd \
-    --hash=sha256:6fd1ad24dc235e4ab88cda009e19bf347aabb975e44fd5c2fb22a3f6e4141277 \
-    --hash=sha256:7171ae35d2c33d326ac19dd8facb1e82e5fd04ef8c6c0e394d7af55a55051c22 \
-    --hash=sha256:73d496de46cd2cdbdbcce4ae4bcdb4afb6a11234a1df9c085249d55166b95116 \
-    --hash=sha256:7425ac3c54430f5fc5e7b6f41d41e704db073309acfc09305816bc6a0b26bb16 \
-    --hash=sha256:74afa28374a3c3a11b3b5e5fca0ae03bef8450d6aa3ab3a1e2c30e3a75d023dc \
-    --hash=sha256:79573c24a46ce11aab457b472efd8d125e5a51da2d1d24387666cd85f54c05b2 \
-    --hash=sha256:88547535b787a6c9ce4086917b6e1d291aa8ed914fdd3a838b3539dc95c12804 \
-    --hash=sha256:88bbae4d40d5a46142e70d58bf664a89b6b4befaea7b2ecc14e03cedb8e06c04 \
-    --hash=sha256:8cccf4f81371f257440c88faed6b74f1053eef90807b77e31ca057b2db74edb1 \
-    --hash=sha256:9baa544e6acc91130e926e8c802a17f3b16fbea0fd441b5a60f5cf2cc5c3deba \
-    --hash=sha256:a36692b8491d30a8c75f1dfee65bef119d6f39ea84ee04d9f9311f83c5ad9390 \
-    --hash=sha256:a47681378a0439215912ef542c45a783484d4dd82bac412b71e59cf9c0e1cea0 \
-    --hash=sha256:ab232e7fdb44cdfbf55fc3afa31bcdb0d8980b9b95c38b6405df2acb672af0e0 \
-    --hash=sha256:af338aa93554be859173c39c85243970dc6a289fa907402289eeae7543e1ae18 \
-    --hash=sha256:afd964fd43b10c12213574db492cb8f73b2f0826c8df07a68288f8f19af2ebe6 \
-    --hash=sha256:b32888aad8b6e68f83a8fdccbf3165f5469702a7544472bdf41f582970ed3311 \
-    --hash=sha256:c31eebe420a9a5d2887b13000b043ff6ca27c452a9a22fa71f35f118e8d4bf89 \
-    --hash=sha256:cf30f6e3c077c8e6a9a7809c94551203c8843e74ba0c960f4a98cd80d4665d39 \
-    --hash=sha256:d40770d7c0fd5cbed9d84b2c3f2e156431a12c9a37dc6284060fb4bec0b7ffd4 \
-    --hash=sha256:d8a210b158a34164de8bb68b0e7780041a903d7b00c87e906fb69928bf7890d5 \
-    --hash=sha256:dc4a8d2b25efb6681ecacad42fca8859f88092d8732b170de6a5dddd80a1c8fa \
-    --hash=sha256:e01375f275f010fcbf7f643b4279896d04e571889b8a5b3f848423d91bf07050 \
-    --hash=sha256:e1a4120ae5705f673727d3253de3ed0e016f7cd78dc463db1b31e2463e1f3cf6 \
-    --hash=sha256:e228514a06843cae89621384cfe3a80418f3c04aadf8a3b14e46a7be704e4235 \
-    --hash=sha256:e405adefb53a435f01efa7ccdec012c016b5a1d3f35459990afc39b6be4d5056 \
-    --hash=sha256:e6b13af258d6a9ad602d57d889f83b9d5543acd471eee12eb51f5b01f8eb1bc2 \
-    --hash=sha256:e6f40a8aa5a92f150bdb3e1c44b7e98fb7113955b2e5394122fa5532fec4b418 \
-    --hash=sha256:e71d5c6ebac14875668a1e90baf2ea0ef5b7ac7918355850c0908ae82bcb297c \
-    --hash=sha256:ed7c635ae45cfbc1a7371f708727bf74690daedc49b4dba310590ca0bd28aa8a \
-    --hash=sha256:f38e60678850c42461d4202739f9bf1e3a737c7ad283638251e79cc49effb6b6 \
-    --hash=sha256:f66eb08feaa410fe4eebd17f2a2c8e2e46d3476e9f8c783daa8e09e0faa666d0 \
-    --hash=sha256:f9b2601381be482f70e5d1051a5965c25fb3625455a2bf520b5a077b22afb775 \
-    --hash=sha256:fbd3c8319de8e1dc79d346929cd71d523622da527cca14e0c1d257e31c2b8b10 \
-    --hash=sha256:fd341868a4b6714a5962c1af0bd44f7c404ef78720c7de4892901e540417111c
-    # via scout-apm
 xhtml2pdf==0.2.17 \
     --hash=sha256:09ddbc31aa0e38a16f2f3cb73be89af5f7c968c17a564afdd685d280e39c526d \
     --hash=sha256:61a7ecac829fed518f7dbcb916e9d56bea6e521e02e54644b3d0ca33f0658315