Release 0.3.0

.coveragerc

@@ -3,7 +3,7 @@ branch = True
 source = .
 data_file=/tmp/coverage
 omit =
-    open_discussions/wsgi.py
+    main/wsgi.py
     manage.py
     ./.tox/*
     */migrations/*

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
           - 6379:6379
 
       elastic:
-        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.16
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.17
         env:
           network.host: "0.0.0.0"
           http.cors.enabled: "true"
@@ -94,7 +94,7 @@ jobs:
           MITOPEN_COOKIE_NAME: cookie_monster
 
       - name: Upload coverage to CodeCov
-        uses: codecov/codecov-action@v3.1.4
+        uses: codecov/codecov-action@v3.1.6
         with:
           file: ./coverage.xml
 
@@ -139,7 +139,7 @@ jobs:
           NODE_ENV: test
 
       - name: Upload coverage to CodeCov
-        uses: codecov/codecov-action@v3.1.4
+        uses: codecov/codecov-action@v3.1.6
         with:
           file: coverage/lcov.info
 

.github/workflows/production.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: akhileshns/heroku-deploy@581dd286c962b6972d427fcf8980f60755c15520
         with:
           heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
-          heroku_app_name: "odl-open-discussions"
+          heroku_app_name: "mitopen-production"
           heroku_email: ${{ secrets.HEROKU_EMAIL }}
           branch: release
   # runs ONLY on a failure of the CI workflow

.github/workflows/release-candiate.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: akhileshns/heroku-deploy@581dd286c962b6972d427fcf8980f60755c15520
         with:
           heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
-          heroku_app_name: "odl-open-discussions-rc"
+          heroku_app_name: "mitopen-rc"
           heroku_email: ${{ secrets.HEROKU_EMAIL }}
           branch: release-candidate
   # runs ONLY on a failure of the CI workflow

.secrets.baseline

@@ -135,10 +135,10 @@
         "line_number": 2551
       }
     ],
-    "frontends/open-discussions/src/reducers/auth.js": [
+    "frontends/mit-open/src/reducers/auth.js": [
       {
         "type": "Secret Keyword",
-        "filename": "frontends/open-discussions/src/reducers/auth.js",
+        "filename": "frontends/mit-open/src/reducers/auth.js",
         "hashed_secret": "e3c328a97de7239b3f60eecda765a69535205744",
         "is_verified": false,
         "line_number": 18

Procfile

@@ -1,5 +1,5 @@
 release: bash scripts/heroku-release-phase.sh
 web: bin/start-nginx bin/start-pgbouncer newrelic-admin run-program uwsgi uwsgi.ini
-worker: bin/start-pgbouncer newrelic-admin run-program celery -A open_discussions.celery:app worker -Q default --concurrency=2 -B -l $MITOPEN_LOG_LEVEL
-extra_worker_2x: bin/start-pgbouncer newrelic-admin run-program celery -A open_discussions.celery:app worker -Q edx_content,default --concurrency=2 -l $MITOPEN_LOG_LEVEL
-extra_worker_performance: bin/start-pgbouncer newrelic-admin run-program celery -A open_discussions.celery:app worker -Q edx_content,default -l $MITOPEN_LOG_LEVEL
+worker: bin/start-pgbouncer newrelic-admin run-program celery -A main.celery:app worker -Q default --concurrency=2 -B -l $MITOPEN_LOG_LEVEL
+extra_worker_2x: bin/start-pgbouncer newrelic-admin run-program celery -A main.celery:app worker -Q edx_content,default --concurrency=2 -l $MITOPEN_LOG_LEVEL
+extra_worker_performance: bin/start-pgbouncer newrelic-admin run-program celery -A main.celery:app worker -Q edx_content,default -l $MITOPEN_LOG_LEVEL

README.md

@@ -58,7 +58,7 @@ and run
 docker compose run --rm web python manage.py backpopulate_xpro_data
 ```
 
-See [learning_resources/management/commands](learning_resources/management/commands) and [open_discussions/settings_course_etl.py](open_discussions/settings_course_etl.py) for more ETL commands and their relevant environment variables.
+See [learning_resources/management/commands](learning_resources/management/commands) and [main/settings_course_etl.py](main/settings_course_etl.py) for more ETL commands and their relevant environment variables.
 
 ## Code Generation
 

RELEASE.rst

@@ -1,6 +1,36 @@
 Release Notes
 =============
 
+Version 0.3.0
+-------------
+
+- Allow for blank OCW terms/years (adjust readable_id accordingly), raise an error at end of ocw_courses_etl function if any exceptions occurred during processing (#475)
+- Remove all references to open-discussions (#472)
+- Fix prolearn etl (#471)
+- Multiple filter options for learningresources and contenfiles API rest endpoints (#449)
+- Lock file maintenance (#470)
+- Update dependency pluggy to v1.4.0 (#468)
+- Update dependency jekyll-feed to v0.17.0 (#467)
+- Update dependency @types/react to v18.2.53 (#469)
+- Update dependency ipython to v8.21.0 (#466)
+- Update dependency google-api-python-client to v2.116.0 (#465)
+- Update dependency django-debug-toolbar to v4.3.0 (#464)
+- Update dependency @sentry/react to v7.99.0 (#463)
+- Update apache/tika Docker tag to v2.5.0 (#461)
+- Update docker.elastic.co/elasticsearch/elasticsearch Docker tag to v7.17.17 (#460)
+- Update dependency prettier to v3.2.5 (#462)
+- Update dependency social-auth-core to v4.5.2 (#458)
+- Update dependency toolz to v0.12.1 (#459)
+- Update dependency moto to v4.2.14 (#457)
+- Update dependency drf-spectacular to v0.27.1 (#456)
+- Update dependency boto3 to v1.34.34 (#454)
+- Update dependency beautifulsoup4 to v4.12.3 (#453)
+- Update dependency axios to v1.6.7 (#452)
+- Update codecov/codecov-action action to v3.1.6 (#451)
+- Update all non-major dev-dependencies (#450)
+- Added support to set SOCIAL_AUTH_ALLOWED_REDIRECT_HOSTS (#429)
+- do not allow None in levels/languages (#446)
+
 Version 0.2.2 (Released February 02, 2024)
 -------------
 

app.json

@@ -20,7 +20,7 @@
       "url": "https://github.com/heroku/heroku-buildpack-nginx"
     }
   ],
-  "description": "open-discussions",
+  "description": "mit-open",
   "env": {
     "ALLOWED_HOSTS": {
       "description": "",
@@ -547,6 +547,10 @@
       "description": "The client secret provided by the OpenID Connect provider.",
       "required": false
     },
+    "SOCIAL_AUTH_ALLOWED_REDIRECT_HOSTS": {
+      "description": "The list of additional redirect hosts allowed for social auth.",
+      "required": false
+    },
     "USERINFO_URL": {
       "description": "Provder endpoint where client sends requests for identity claims.",
       "required": false
@@ -573,7 +577,7 @@
     }
   },
   "keywords": ["Django", "Python", "MIT", "Office of Digital Learning"],
-  "name": "open_discussions",
+  "name": "mit_open",
   "repository": "https://github.com/mitodl/mit-open",
   "scripts": {
     "postdeploy": "./manage.py migrate --noinput"

articles/models.py

@@ -2,7 +2,7 @@
 
 from django.db import models
 
-from open_discussions.models import TimestampedModel
+from main.models import TimestampedModel
 
 
 class Article(TimestampedModel):

articles/views.py

@@ -5,7 +5,7 @@
 
 from articles.models import Article
 from articles.serializers import ArticleSerializer
-from open_discussions.constants import VALID_HTTP_METHODS
+from main.constants import VALID_HTTP_METHODS
 
 # Create your views here.
 

articles/views_test.py

@@ -3,7 +3,7 @@
 import pytest
 from rest_framework.reverse import reverse
 
-from open_discussions.factories import UserFactory
+from main.factories import UserFactory
 
 pytestmark = [pytest.mark.django_db]
 

authentication/middleware_test.py

@@ -14,7 +14,7 @@
     SocialAuthExceptionRedirectMiddleware,
 )
 from authentication.models import BlockedIPRange
-from open_discussions.factories import UserFactory
+from main.factories import UserFactory
 
 
 def test_process_exception_no_strategy(mocker, rf, settings):

authentication/models.py

@@ -7,7 +7,7 @@
 from django.utils.safestring import mark_safe
 from ipware.utils import is_private_ip
 
-from open_discussions.models import TimestampedModel
+from main.models import TimestampedModel
 
 HELP_TEXT = """
 @spam.com: blocks all emails containing `@spam.com` like `joe@spam.com.edu`<br/>

authentication/pipeline/user_test.py

@@ -3,7 +3,7 @@
 import pytest
 
 from authentication.pipeline import user as user_actions
-from open_discussions.factories import UserFactory
+from main.factories import UserFactory
 
 
 @pytest.mark.parametrize("hijacked", [True, False])

authentication/urls.py

@@ -1,9 +1,18 @@
 """URL configurations for authentication"""
 
-from django.urls import re_path
+from django.urls import include, re_path, reverse_lazy
+from django.views.generic.base import RedirectView
 
 from authentication.views import CustomLogoutView
 
 urlpatterns = [
+    re_path(r"", include("social_django.urls", namespace="social")),
+    re_path(
+        r"^login/$",
+        RedirectView.as_view(
+            url=reverse_lazy("social:begin", args=["ol-oidc"]), query_string=True
+        ),
+        name="login",
+    ),
     re_path(r"^logout/$", CustomLogoutView.as_view(), name="logout"),
 ]

channels/api_test.py

@@ -5,7 +5,7 @@
 from channels.api import add_user_role, remove_user_role
 from channels.constants import FIELD_ROLE_MODERATORS
 from channels.models import FieldChannelGroupRole
-from open_discussions.factories import UserFactory
+from main.factories import UserFactory
 
 pytestmark = pytest.mark.django_db
 

channels/models.py

@@ -9,7 +9,7 @@
 
 from channels.constants import FIELD_ROLE_CHOICES
 from learning_resources.models import LearningResource
-from open_discussions.models import TimestampedModel
+from main.models import TimestampedModel
 from profiles.utils import avatar_uri, banner_uri
 from widgets.models import WidgetList
 

channels/permissions.py

@@ -9,7 +9,7 @@
 
 from channels.api import is_moderator
 from channels.models import FieldChannel
-from open_discussions.permissions import is_admin_user
+from main.permissions import is_admin_user
 
 log = logging.getLogger()
 

channels/permissions_test.py

@@ -6,7 +6,7 @@
 from channels import permissions
 from channels.api import add_user_role
 from channels.constants import FIELD_ROLE_MODERATORS
-from open_discussions.factories import UserFactory
+from main.factories import UserFactory
 
 pytestmark = pytest.mark.django_db
 

channels/serializers_test.py

@@ -18,7 +18,7 @@
     LearningPathPreviewSerializer,
 )
 from learning_resources.factories import LearningPathFactory
-from open_discussions.factories import UserFactory
+from main.factories import UserFactory
 
 # pylint:disable=redefined-outer-name
 pytestmark = pytest.mark.django_db

channels/views.py

@@ -21,7 +21,7 @@
     FieldModeratorSerializer,
 )
 from learning_resources.views import LargePagination
-from open_discussions.constants import VALID_HTTP_METHODS
+from main.constants import VALID_HTTP_METHODS
 
 log = logging.getLogger(__name__)
 

channels/views_test.py

@@ -17,7 +17,7 @@
 from channels.serializers import FieldChannelSerializer
 from learning_resources.constants import LearningResourceType
 from learning_resources.factories import LearningResourceFactory
-from open_discussions.factories import UserFactory
+from main.factories import UserFactory
 
 pytestmark = pytest.mark.django_db
 

ckeditor/views.py

@@ -9,7 +9,7 @@
 from rest_framework import status
 from rest_framework.decorators import api_view, permission_classes
 
-from open_discussions.permissions import AnonymousAccessReadonlyPermission
+from main.permissions import AnonymousAccessReadonlyPermission
 
 
 @api_view()

conftest.py

@@ -7,7 +7,7 @@
 from fixtures.common import *  # noqa: F403
 from fixtures.opensearch import *  # noqa: F403
 from fixtures.users import *  # noqa: F403
-from open_discussions.exceptions import DoNotUseRequestException
+from main.exceptions import DoNotUseRequestException
 
 
 @pytest.fixture(autouse=True)

docker-compose-notebook.yml

@@ -26,7 +26,7 @@ services:
       - .:/src
     environment:
       <<: *py-environment
-      BASE_DJANGO_APP_NAME: open_discussions
+      BASE_DJANGO_APP_NAME: main
       # See https://docs.djangoproject.com/en/4.1/topics/async/#async-safety
       # Do no use this outside the notebook
       DJANGO_ALLOW_ASYNC_UNSAFE: true

docker-compose.yml

@@ -114,8 +114,8 @@ services:
     command: >
       /bin/bash -c '
       sleep 3;
-      celery -A open_discussions.celery:app worker -Q default -B -l ${MITOPEN_LOG_LEVEL:-INFO} &
-      celery -A open_discussions.celery:app worker -Q edx_content,default -l ${MITOPEN_LOG_LEVEL:-INFO}'
+      celery -A main.celery:app worker -Q default -B -l ${MITOPEN_LOG_LEVEL:-INFO} &
+      celery -A main.celery:app worker -Q edx_content,default -l ${MITOPEN_LOG_LEVEL:-INFO}'
     links:
       - db
       - opensearch-node-mitopen
@@ -124,7 +124,7 @@ services:
       - .:/src
       - django_media:/var/media
   tika:
-    image: apache/tika:2.4.0
+    image: apache/tika:2.5.0
     ports:
       - "9998:9998"