Skip to content

Commit 2bb1632

Browse files
kdmccormickkdmccormick
committed
chore: Switch to new openedx-learning import paths
Upgrades openedx-learning from 0.31.0 to 0.32.0
1 parent d847d22 commit 2bb1632

65 files changed

Lines changed: 291 additions & 286 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cms/djangoapps/contentstore/migrations/0001_squashed_0015_switch_to_openedx_content.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import django.db.migrations.operations.special
44
import django.db.models.deletion
55
import opaque_keys.edx.django.models
6-
import openedx_learning.lib.fields
7-
import openedx_learning.lib.validators
6+
import openedx_django_lib.fields
7+
import openedx_django_lib.validators
88
import uuid
99
from django.conf import settings
1010
from django.db import migrations, models
@@ -107,8 +107,8 @@ class Migration(migrations.Migration):
107107
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
108108
('context_key', opaque_keys.edx.django.models.CourseKeyField(help_text='Linking status for course context key', max_length=255, unique=True)),
109109
('status', models.CharField(choices=[('pending', 'Pending'), ('processing', 'Processing'), ('failed', 'Failed'), ('completed', 'Completed')], help_text='Status of links in given learning context/course.', max_length=20)),
110-
('created', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
111-
('updated', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
110+
('created', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
111+
('updated', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
112112
],
113113
options={
114114
'verbose_name': 'Learning Context Links status',
@@ -121,13 +121,13 @@ class Migration(migrations.Migration):
121121
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
122122
('uuid', models.UUIDField(default=uuid.uuid4, editable=False, unique=True, verbose_name='UUID')),
123123
('upstream_usage_key', opaque_keys.edx.django.models.UsageKeyField(help_text='Upstream block usage key, this value cannot be null and useful to track upstream library blocks that do not exist yet', max_length=255)),
124-
('upstream_context_key', openedx_learning.lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_index=True, help_text='Upstream context key i.e., learning_package/library key', max_length=500)),
124+
('upstream_context_key', openedx_django_lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_index=True, help_text='Upstream context key i.e., learning_package/library key', max_length=500)),
125125
('downstream_usage_key', opaque_keys.edx.django.models.UsageKeyField(max_length=255, unique=True)),
126126
('downstream_context_key', opaque_keys.edx.django.models.CourseKeyField(db_index=True, max_length=255)),
127127
('version_synced', models.IntegerField()),
128128
('version_declined', models.IntegerField(blank=True, null=True)),
129-
('created', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
130-
('updated', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
129+
('created', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
130+
('updated', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
131131
('upstream_block', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='links', to='openedx_content.component')),
132132
],
133133
options={
@@ -140,13 +140,13 @@ class Migration(migrations.Migration):
140140
fields=[
141141
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
142142
('uuid', models.UUIDField(default=uuid.uuid4, editable=False, unique=True, verbose_name='UUID')),
143-
('upstream_context_key', openedx_learning.lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_index=True, help_text='Upstream context key i.e., learning_package/library key', max_length=500)),
143+
('upstream_context_key', openedx_django_lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_index=True, help_text='Upstream context key i.e., learning_package/library key', max_length=500)),
144144
('downstream_usage_key', opaque_keys.edx.django.models.UsageKeyField(max_length=255, unique=True)),
145145
('downstream_context_key', opaque_keys.edx.django.models.CourseKeyField(db_index=True, max_length=255)),
146146
('version_synced', models.IntegerField()),
147147
('version_declined', models.IntegerField(blank=True, null=True)),
148-
('created', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
149-
('updated', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
148+
('created', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
149+
('updated', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
150150
('upstream_container_key', opaque_keys.edx.django.models.ContainerKeyField(help_text='Upstream block key (e.g. lct:...), this value cannot be null and is useful to track upstream library blocks that do not exist yet or were deleted.', max_length=255)),
151151
('upstream_container', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='links', to='openedx_content.container')),
152152
],

‎cms/djangoapps/contentstore/migrations/0009_learningcontextlinksstatus_publishableentitylink.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import django.db.models.deletion
66
import opaque_keys.edx.django.models
7-
import openedx_learning.lib.fields
8-
import openedx_learning.lib.validators
7+
import openedx_django_lib.fields
8+
import openedx_django_lib.validators
99
from django.db import migrations, models
1010

1111

@@ -39,8 +39,8 @@ class Migration(migrations.Migration):
3939
max_length=20,
4040
),
4141
),
42-
('created', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
43-
('updated', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
42+
('created', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
43+
('updated', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
4444
],
4545
options={
4646
'verbose_name': 'Learning Context Links status',
@@ -61,7 +61,7 @@ class Migration(migrations.Migration):
6161
),
6262
(
6363
'upstream_context_key',
64-
openedx_learning.lib.fields.MultiCollationCharField(
64+
openedx_django_lib.fields.MultiCollationCharField(
6565
db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'},
6666
db_index=True,
6767
help_text='Upstream context key i.e., learning_package/library key',
@@ -72,8 +72,8 @@ class Migration(migrations.Migration):
7272
('downstream_context_key', opaque_keys.edx.django.models.CourseKeyField(db_index=True, max_length=255)),
7373
('version_synced', models.IntegerField()),
7474
('version_declined', models.IntegerField(blank=True, null=True)),
75-
('created', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
76-
('updated', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
75+
('created', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
76+
('updated', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
7777
(
7878
'upstream_block',
7979
models.ForeignKey(

‎cms/djangoapps/contentstore/migrations/0010_container_link_models.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import django.db.models.deletion
55
import opaque_keys.edx.django.models
6-
import openedx_learning.lib.fields
7-
import openedx_learning.lib.validators
6+
import openedx_django_lib.fields
7+
import openedx_django_lib.validators
88
from django.db import migrations, models
99

1010

@@ -40,13 +40,13 @@ class Migration(migrations.Migration):
4040
fields=[
4141
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
4242
('uuid', models.UUIDField(default=uuid.uuid4, editable=False, unique=True, verbose_name='UUID')),
43-
('upstream_context_key', openedx_learning.lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_index=True, help_text='Upstream context key i.e., learning_package/library key', max_length=500)),
43+
('upstream_context_key', openedx_django_lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_index=True, help_text='Upstream context key i.e., learning_package/library key', max_length=500)),
4444
('downstream_usage_key', opaque_keys.edx.django.models.UsageKeyField(max_length=255, unique=True)),
4545
('downstream_context_key', opaque_keys.edx.django.models.CourseKeyField(db_index=True, max_length=255)),
4646
('version_synced', models.IntegerField()),
4747
('version_declined', models.IntegerField(blank=True, null=True)),
48-
('created', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
49-
('updated', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
48+
('created', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
49+
('updated', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
5050
('upstream_container_key', opaque_keys.edx.django.models.ContainerKeyField(help_text='Upstream block key (e.g. lct:...), this value cannot be null and is useful to track upstream library blocks that do not exist yet or were deleted.', max_length=255)),
5151
('upstream_container', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='links', to='oel_publishing.container')),
5252
],

‎cms/djangoapps/contentstore/models.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
from opaque_keys.edx.django.models import ContainerKeyField, CourseKeyField, UsageKeyField
1616
from opaque_keys.edx.keys import CourseKey, UsageKey
1717
from opaque_keys.edx.locator import LibraryContainerLocator
18-
from openedx_learning.api.authoring import get_published_version
19-
from openedx_learning.api.authoring_models import Component, Container
20-
from openedx_learning.lib.fields import (
18+
from openedx_content.api import get_published_version
19+
from openedx_content.models_api import Component, Container
20+
from openedx_django_lib.fields import (
2121
immutable_uuid_field,
2222
key_field,
2323
manual_date_time_field,

‎cms/djangoapps/contentstore/rest_api/v0/views/api_heartbeat.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ def get(self, request: Request):
3232
**Response Values**
3333
3434
If the request is successful, an HTTP 200 "OK" response is returned.
35-
The HTTP 200 response contains a single dict with the "authoring_api_enabled" value "True".
35+
The HTTP 200 response contains a single dict with the "content_api_enabled" value "True".
3636
3737
**Example Response**
3838
3939
```json
4040
{
41-
"authoring_api_enabled": "True"
41+
"content_api_enabled": "True"
4242
}
4343
```
4444
"""

‎cms/djangoapps/contentstore/rest_api/v1/views/tests/test_home.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from django.test import override_settings
1111
from django.urls import reverse
1212
from opaque_keys.edx.locator import LibraryLocatorV2
13-
from openedx_learning.api import authoring as authoring_api
13+
from openedx_content import api as content_api
1414
from organizations.tests.factories import OrganizationFactory
1515
from rest_framework import status
1616

@@ -272,7 +272,7 @@ def setUp(self):
272272
self.url = reverse("cms.djangoapps.contentstore:v1:libraries")
273273
# Create a collection to migrate this library to
274274
collection_key = "test-collection"
275-
authoring_api.create_collection(
275+
content_api.create_collection(
276276
learning_package_id=learning_package.id,
277277
key=collection_key,
278278
title="Test Collection",

‎cms/djangoapps/contentstore/views/tests/test_clipboard_paste.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
XBLOCK_UPDATED,
1414
)
1515
from openedx_events.tests.utils import OpenEdxEventsTestMixin
16-
from openedx_tagging.core.tagging.models import Tag
16+
from openedx_tagging.models import Tag
1717
from organizations.models import Organization
1818
from xmodule.modulestore.django import contentstore, modulestore
1919
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, upload_file_to_course, ImmediateOnCommitMixin

‎cms/djangoapps/modulestore_migrator/api/read_api.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
from opaque_keys.edx.locator import (
1212
LibraryLocatorV2, LibraryUsageLocatorV2, LibraryContainerLocator
1313
)
14-
from openedx_learning.api.authoring import get_draft_version, get_all_drafts
15-
from openedx_learning.api.authoring_models import (
14+
from openedx_content.api import get_draft_version, get_all_drafts
15+
from openedx_content.models_api import (
1616
PublishableEntityVersion, PublishableEntity, DraftChangeLogRecord
1717
)
1818
from xblock.plugin import PluginMissingError

‎cms/djangoapps/modulestore_migrator/api/write_api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from celery.result import AsyncResult
77
from opaque_keys.edx.locator import LibraryLocatorV2
8-
from openedx_learning.api.authoring import get_collection
8+
from openedx_content.api import get_collection
99

1010
from openedx.core.types.user import AuthUser
1111
from openedx.core.djangoapps.content_libraries.api import get_library

‎cms/djangoapps/modulestore_migrator/models.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
LearningContextKeyField,
1212
UsageKeyField,
1313
)
14-
from openedx_learning.api.authoring_models import (
14+
from openedx_content.models_api import (
1515
Collection,
1616
DraftChangeLog,
1717
DraftChangeLogRecord,

0 commit comments

Comments
 (0)