Miscellaneous changes to keep up to date with the cookiecutter

- Missing requirements - Environment variables in tox.ini - New programs in supervisor
hypothesis · Nov 5, 2024 · 0add8a1 · 0add8a1
1 parent 0765b53
commit 0add8a1
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 5 deletions.
diff --git a/.cookiecutter/includes/conf/supervisord-dev.conf.json b/.cookiecutter/includes/conf/supervisord-dev.conf.json
@@ -13,8 +13,11 @@
     "worker": {
       "command": "newrelic-admin run-program celery -A lms.tasks.celery:app worker --loglevel=INFO"
     },
+    "worker-email-digests": {
+      "command": "newrelic-admin run-program celery -A lms.tasks.celery:app worker --loglevel=INFO -Q email_digests -n celery-email_digests-@%%h"
+    },
     "assets": {
       "command": "node_modules/.bin/gulp watch"
     }
   }
-}
+}
diff --git a/.cookiecutter/includes/conf/supervisord.conf.json b/.cookiecutter/includes/conf/supervisord.conf.json
@@ -5,6 +5,9 @@
     },
     "worker": {
       "command": "newrelic-admin run-program celery -A lms.tasks.celery:app worker --loglevel INFO"
+    },
+    "worker-email-digests": {
+      "command": "newrelic-admin run-program celery -A lms.tasks.celery:app worker --loglevel INFO -Q email_digests -n celery-email_digests-@%%h"
     }
   }
-}
+}
diff --git a/.cookiecutter/includes/requirements/dev.in b/.cookiecutter/includes/requirements/dev.in
@@ -0,0 +1 @@
+h-testkit
diff --git a/.cookiecutter/includes/requirements/prod.in b/.cookiecutter/includes/requirements/prod.in
@@ -7,6 +7,7 @@ h-assets
 sentry-sdk
 h-pyramid-sentry
 h-vialib
+hubspot-api-client
 importlib_resources
 mailchimp-transactional
 marshmallow

diff --git a/.cookiecutter/includes/tox/passenv b/.cookiecutter/includes/tox/passenv
@@ -18,3 +18,5 @@ dev: JSTOR_API_SECRET
 dev: DISABLE_KEY_ROTATION
 dev: EMAIL_PREFERENCES_SECRET
 dev: ADMIN_USERS
+dev: HUBSPOT_API_KEY
+dev: HUBSPOT_ACCOUNT_ID
diff --git a/.cookiecutter/includes/tox/setenv b/.cookiecutter/includes/tox/setenv
@@ -14,6 +14,7 @@ dev: OAUTH2_STATE_SECRET = {env:OAUTH2_STATE_SECRET:notasecret}
 dev: RPC_ALLOWED_ORIGINS = {env:RPC_ALLOWED_ORIGINS:http://localhost:5000}
 dev: VIA_URL = {env:VIA_URL:http://localhost:9083}
 dev: SESSION_COOKIE_SECRET = {env:SESSION_COOKIE_SECRET:notasecret}
+dev: DISABLE_KEY_ROTATION=1
 VIA_SECRET = not_a_secret
 FDW_USERS = {env:FDW_USERS:report-fdw}
 HTTP_HOST = {env:HTTP_HOST:localhost:8001}

diff --git a/conf/supervisord-dev.conf b/conf/supervisord-dev.conf
@@ -38,7 +38,6 @@ stderr_events_enabled=true
 stopsignal=KILL
 stopasgroup=true
 
-
 [program:assets]
 command=node_modules/.bin/gulp watch
 stdout_events_enabled=true

diff --git a/requirements/dev.in b/requirements/dev.in
@@ -4,4 +4,4 @@ pip-sync-faster
 factory-boy
 pyramid-ipython
 supervisor
-h_testkit
+h-testkit
diff --git a/tox.ini b/tox.ini
@@ -12,7 +12,6 @@ skip_install = true
 setenv =
     PYTHONUNBUFFERED = 1
     OBJC_DISABLE_INITIALIZE_FORK_SAFETY = YES
-    dev: DISABLE_KEY_ROTATION=1
     dev: DEV = {env:DEV:true}
     dev: SENTRY_ENVIRONMENT = {env:SENTRY_ENVIRONMENT:dev}
     dev: NEW_RELIC_APP_NAME = {env:NEW_RELIC_APP_NAME:lms}
@@ -42,6 +41,7 @@ setenv =
     dev: RPC_ALLOWED_ORIGINS = {env:RPC_ALLOWED_ORIGINS:http://localhost:5000}
     dev: VIA_URL = {env:VIA_URL:http://localhost:9083}
     dev: SESSION_COOKIE_SECRET = {env:SESSION_COOKIE_SECRET:notasecret}
+    dev: DISABLE_KEY_ROTATION=1
     VIA_SECRET = not_a_secret
     FDW_USERS = {env:FDW_USERS:report-fdw}
     HTTP_HOST = {env:HTTP_HOST:localhost:8001}