Merge branch 'master' into turn-on-extracted-xblocks

Author: farhan

.github/renovate.json5

@@ -1,43 +1,45 @@
-// This file is written in "JSON5" (https://json5.org/) so that we can use comments.
 {
-  "extends": [
-    "config:base",
-    "schedule:weekly",
-    ":automergeLinters",
-    ":automergeMinor",
-    ":automergeTesters",
-    ":enableVulnerabilityAlerts",
-    ":semanticCommits",
-    ":updateNotScheduled"
+  extends: [
+    'config:recommended',
+    'schedule:weekly',
+    ':automergeLinters',
+    ':automergeMinor',
+    ':automergeTesters',
+    ':enableVulnerabilityAlerts',
+    ':semanticCommits',
+    ':updateNotScheduled',
   ],
-  "packageRules": [
+  packageRules: [
     {
-      "matchDepTypes": [
-        "devDependencies"
+      matchDepTypes: [
+        'devDependencies',
       ],
-      "matchUpdateTypes": [
-        "lockFileMaintenance",
-        "minor",
-        "patch",
-        "pin"
+      matchUpdateTypes: [
+        'lockFileMaintenance',
+        'minor',
+        'patch',
+        'pin',
       ],
-      "automerge": true
+      automerge: true,
     },
     {
-      "matchPackagePatterns": ["@edx", "@openedx"],
-      "matchUpdateTypes": ["minor", "patch"],
-      "automerge": true
-    }
+      matchUpdateTypes: [
+        'minor',
+        'patch',
+      ],
+      automerge: true,
+      matchPackageNames: [
+        '/@edx/',
+        '/@openedx/',
+      ],
+    },
+  ],
+  ignoreDeps: [
+    'karma-spec-reporter',
   ],
-  // When adding an ignoreDep, please include a reason and a public link that we can use to follow up and ensure
-  // that the ignoreDep is removed.
-  // This can be done as a comment within the ignoreDeps list.
-  "ignoreDeps": [
-    // karma-spec-reporter>0.20.0 does not seem compatible with our super-old 2016 Karma version (0.13.22).
-    // Ticket link: None, as upgrading Karma does not strike as worth the benefit.
-    "karma-spec-reporter"
+  timezone: 'America/New_York',
+  prConcurrentLimit: 3,
+  enabledManagers: [
+    'npm',
   ],
-  "timezone": "America/New_York",
-  "prConcurrentLimit": 3,
-  "enabledManagers": ["npm"]
 }

cms/conftest.py

@@ -6,10 +6,7 @@
 only running cms tests.
 """
 
-
-import importlib
 import logging
-import os
 
 import pytest
 
@@ -29,13 +26,6 @@ def pytest_configure(config):
     else:
         logging.info("pytest did not register json_report correctly")
 
-    if config.getoption('help'):
-        return
-    settings_module = os.environ.get('DJANGO_SETTINGS_MODULE')
-    startup_module = 'cms.startup' if settings_module.startswith('cms') else 'lms.startup'
-    startup = importlib.import_module(startup_module)
-    startup.run()
-
 
 @pytest.fixture(autouse=True, scope='function')
 def _django_clear_site_cache():

cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py

@@ -1562,7 +1562,7 @@ def _get_release_date(xblock, user=None):
     reset_to_default = False
     try:
         reset_to_default = xblock.start.year < 1900
-    except ValueError:
+    except (ValueError, AttributeError):
         # For old mongo courses, accessing the start attribute calls `to_json()`,
         # which raises a `ValueError` for years < 1900.
         reset_to_default = True

cms/envs/common.py

@@ -2925,3 +2925,26 @@ def _should_send_learning_badge_events(settings):
 # .. for now it wil impact country listing in auth flow and user profile.
 # .. eg ['US', 'CA']
 DISABLED_COUNTRIES = []
+
+# .. setting_name: LIBRARY_ENABLED_BLOCKS
+# .. setting_default: ['problem', 'video', 'html', 'drag-and-drop-v2']
+# .. setting_description: List of block types that are ready/enabled to be created/used
+# .. in libraries. Both basic blocks and advanced blocks can be included.
+# .. In the future, we will support individual configuration per library - see
+# .. openedx/core/djangoapps/content_libraries/api.py::get_allowed_block_types()
+LIBRARY_ENABLED_BLOCKS = [
+    'problem',
+    'video',
+    'html',
+    'drag-and-drop-v2',
+    'conditional',
+    'done',
+    'freetextresponse',
+    'google-calendar',
+    'google-document',
+    'invideoquiz',
+    'pdf',
+    'poll',
+    'survey',
+    'word_cloud',
+]