parent 66ade07

author Salman Nawaz <[email protected]> 1689145502 +0500 committer Awais Qureshi <[email protected]> 1690802535 +0500 fix: django 4.2 upgrade
openedx · Jul 31, 2023 · f6d6d6b · f6d6d6b
1 parent 66ade07
commit f6d6d6b
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 91 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
       matrix:
         os: [ ubuntu-20.04 ]
         python-version: [ '3.8' ]
-        toxenv: [django32, quality ]
+        toxenv: [django32, django42, quality]
     steps:
       - uses: actions/checkout@v2
         continue-on-error: true

diff --git a/Makefile b/Makefile
@@ -55,7 +55,6 @@ upgrade: $(COMMON_CONSTRAINTS_TXT)
 	pip-compile --upgrade -o requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in requirements/test.in requirements/travis.in
 	pip-compile --upgrade -o requirements/quality.txt requirements/base.in requirements/quality.in requirements/test.in
 	pip-compile --upgrade -o requirements/test.txt requirements/base.in requirements/test.in
-	pip-compile --upgrade -o requirements/travis.txt requirements/travis.in
 	pip-compile --upgrade -o requirements/ci.txt requirements/ci.in
 	# Let tox control the Django version for tests
 	grep -e "^django==" requirements/test.txt > requirements/django.txt

diff --git a/google_drive/conf/locale/en/LC_MESSAGES/django.po b/google_drive/conf/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-06 15:49+0300\n"
+"POT-Creation-Date: 2023-07-31 16:18+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,101 +17,95 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: google_drive/google_calendar.py:40 google_drive/google_docs.py:54
-#: google_drive/templates/html/google_calendar_edit.html:17
-#: google_drive/templates/html/google_docs_edit.html:17
+#: google_calendar.py:41 google_docs.py:55
+#: templates/html/google_calendar_edit.html:17
+#: templates/html/google_docs_edit.html:17
 msgid "Display Name"
 msgstr ""
 
-#: google_drive/google_calendar.py:41 google_drive/google_docs.py:55
-#: google_drive/templates/html/google_calendar_edit.html:24
-#: google_drive/templates/html/google_docs_edit.html:24
+#: google_calendar.py:42 google_docs.py:56
+#: templates/html/google_calendar_edit.html:24
+#: templates/html/google_docs_edit.html:24
 msgid "This name appears in the horizontal navigation at the top of the page."
 msgstr ""
 
-#: google_drive/google_calendar.py:46
-#: google_drive/templates/html/google_calendar_edit.html:28
+#: google_calendar.py:47 templates/html/google_calendar_edit.html:28
 msgid "Public Calendar ID"
 msgstr ""
 
-#: google_drive/google_calendar.py:48
+#: google_calendar.py:49
 msgid ""
 "Google provides an ID for publicly available calendars. In the Google "
 "Calendar, open Settings and copy the ID from the Calendar Address section "
 "into this field."
 msgstr ""
 
-#: google_drive/google_calendar.py:55
-#: google_drive/templates/html/google_calendar_edit.html:41
+#: google_calendar.py:56 templates/html/google_calendar_edit.html:41
 msgid "Default View"
 msgstr ""
 
-#: google_drive/google_calendar.py:56
-#: google_drive/templates/html/google_calendar_edit.html:50
+#: google_calendar.py:57 templates/html/google_calendar_edit.html:50
 msgid ""
 "The calendar view that students see by default. A student can change this "
 "view."
 msgstr ""
 
-#: google_drive/google_docs.py:60
-#: google_drive/templates/html/google_docs_edit.html:28
+#: google_docs.py:61 templates/html/google_docs_edit.html:28
 msgid "Embed Code"
 msgstr ""
 
-#: google_drive/google_docs.py:62
-#: google_drive/templates/html/google_docs_edit.html:31
+#: google_docs.py:63 templates/html/google_docs_edit.html:31
 msgid ""
 "Google provides an embed code for Drive documents. In the Google Drive "
 "document, from the File menu, select Publish to the Web. Modify settings as "
 "needed, click Publish, and copy the embed code into this field."
 msgstr ""
 
-#: google_drive/google_docs.py:70
+#: google_docs.py:71
 msgid "Alternative Text"
 msgstr ""
 
-#: google_drive/google_docs.py:71
-#: google_drive/templates/html/google_docs_edit.html:38
+#: google_docs.py:72 templates/html/google_docs_edit.html:38
 msgid ""
 "Alternative text describes an image and appears if the image is unavailable."
 msgstr ""
 
-#: google_drive/templates/html/google_calendar_edit.html:9
+#: templates/html/google_calendar_edit.html:9
 msgid "Invalid Google Calendar"
 msgstr ""
 
-#: google_drive/templates/html/google_calendar_edit.html:10
-#: google_drive/templates/html/google_docs_edit.html:10
+#: templates/html/google_calendar_edit.html:10
+#: templates/html/google_docs_edit.html:10
 msgid "Please correct the outlined fields."
 msgstr ""
 
-#: google_drive/templates/html/google_calendar_edit.html:21
-#: google_drive/templates/html/google_calendar_edit.html:32
-#: google_drive/templates/html/google_docs_edit.html:21
+#: templates/html/google_calendar_edit.html:21
+#: templates/html/google_calendar_edit.html:32
+#: templates/html/google_docs_edit.html:21
 msgid "Clear Value"
 msgstr ""
 
-#: google_drive/templates/html/google_calendar_edit.html:35
+#: templates/html/google_calendar_edit.html:35
 msgid ""
 "Google provides an ID for publicly available calendars. In the Google "
 "Calendar, open Settings and copy the ID from the Calendar Address section "
 "into this field. You can "
 msgstr ""
 
-#: google_drive/templates/html/google_calendar_edit.html:60
-#: google_drive/templates/html/google_docs_edit.html:47
+#: templates/html/google_calendar_edit.html:60
+#: templates/html/google_docs_edit.html:47
 msgid "Save"
 msgstr ""
 
-#: google_drive/templates/html/google_calendar_edit.html:64
-#: google_drive/templates/html/google_docs_edit.html:51
+#: templates/html/google_calendar_edit.html:64
+#: templates/html/google_docs_edit.html:51
 msgid "Cancel"
 msgstr ""
 
-#: google_drive/templates/html/google_docs_edit.html:9
+#: templates/html/google_docs_edit.html:9
 msgid "Invalid Google Document"
 msgstr ""
 
-#: google_drive/templates/html/google_docs_edit.html:35
+#: templates/html/google_docs_edit.html:35
 msgid "Alternative text"
 msgstr ""
diff --git a/google_drive/conf/locale/eo/LC_MESSAGES/text.mo b/google_drive/conf/locale/eo/LC_MESSAGES/text.mo
diff --git a/google_drive/conf/locale/eo/LC_MESSAGES/text.po b/google_drive/conf/locale/eo/LC_MESSAGES/text.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-05 14:27+0300\n"
+"POT-Creation-Date: 2023-07-31 07:16-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,26 +17,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: google_drive/google_calendar.py google_drive/google_docs.py
-#: google_drive/templates/html/google_calendar_edit.html
-#: google_drive/templates/html/google_docs_edit.html
+#: google_calendar.py google_docs.py templates/html/google_calendar_edit.html
+#: templates/html/google_docs_edit.html
 msgid "Display Name"
 msgstr "Dïspläý Nämé Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
 
-#: google_drive/google_calendar.py google_drive/google_docs.py
-#: google_drive/templates/html/google_calendar_edit.html
-#: google_drive/templates/html/google_docs_edit.html
+#: google_calendar.py google_docs.py templates/html/google_calendar_edit.html
+#: templates/html/google_docs_edit.html
 msgid "This name appears in the horizontal navigation at the top of the page."
 msgstr ""
 "Thïs nämé äppéärs ïn thé hörïzöntäl nävïgätïön ät thé töp öf thé pägé. "
 "Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя #"
 
-#: google_drive/google_calendar.py
-#: google_drive/templates/html/google_calendar_edit.html
+#: google_calendar.py templates/html/google_calendar_edit.html
 msgid "Public Calendar ID"
 msgstr "Püßlïç Çäléndär ÌD Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт#"
 
-#: google_drive/google_calendar.py
+#: google_calendar.py
 msgid ""
 "Google provides an ID for publicly available calendars. In the Google "
 "Calendar, open Settings and copy the ID from the Calendar Address section "
@@ -51,27 +48,23 @@ msgstr ""
 " νєłιт єѕѕє ¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα ραяιαтυя. єχ¢єρтєυя ѕιηт σ¢¢αє¢αт "
 "¢υρι∂αтαт ηση ρяσι∂єηт, ѕυηт ιη ¢υłρα qυι σƒƒι¢ια ∂єѕєяυ#"
 
-#: google_drive/google_calendar.py
-#: google_drive/templates/html/google_calendar_edit.html
+#: google_calendar.py templates/html/google_calendar_edit.html
 msgid "Default View"
 msgstr "Défäült Vïéw Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
 
-#: google_drive/google_calendar.py
-#: google_drive/templates/html/google_calendar_edit.html
+#: google_calendar.py templates/html/google_calendar_edit.html
 msgid ""
 "The calendar view that students see by default. A student can change this "
 "view."
 msgstr ""
 "Thé çäléndär vïéw thät stüdénts séé ßý défäült. À stüdént çän çhängé thïs "
 "vïéw. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєт#"
 
-#: google_drive/google_docs.py
-#: google_drive/templates/html/google_docs_edit.html
+#: google_docs.py templates/html/google_docs_edit.html
 msgid "Embed Code"
 msgstr "Émßéd Çödé Ⱡ'σяєм ιρѕυм ∂σłσ#"
 
-#: google_drive/google_docs.py
-#: google_drive/templates/html/google_docs_edit.html
+#: google_docs.py templates/html/google_docs_edit.html
 msgid ""
 "Google provides an embed code for Drive documents. In the Google Drive "
 "document, from the File menu, select Publish to the Web. Modify settings as "
@@ -86,35 +79,34 @@ msgstr ""
 "¢σηѕєqυαт. ∂υιѕ αυтє ιяυяє ∂σłσя ιη яєρяєнєη∂єяιт ιη νσłυρтαтє νєłιт єѕѕє "
 "¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα ραяιαтυя. єχ¢єρтє#"
 
-#: google_drive/google_docs.py
+#: google_docs.py
 msgid "Alternative Text"
 msgstr "Àltérnätïvé Téxt Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
 
-#: google_drive/google_docs.py
-#: google_drive/templates/html/google_docs_edit.html
+#: google_docs.py templates/html/google_docs_edit.html
 msgid ""
 "Alternative text describes an image and appears if the image is unavailable."
 msgstr ""
 "Àltérnätïvé téxt désçrïßés än ïmägé änd äppéärs ïf thé ïmägé ïs ünäväïläßlé."
 " Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυ#"
 
-#: google_drive/templates/html/google_calendar_edit.html
+#: templates/html/google_calendar_edit.html
 msgid "Invalid Google Calendar"
 msgstr "Ìnvälïd Gööglé Çäléndär Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#"
 
-#: google_drive/templates/html/google_calendar_edit.html
-#: google_drive/templates/html/google_docs_edit.html
+#: templates/html/google_calendar_edit.html
+#: templates/html/google_docs_edit.html
 msgid "Please correct the outlined fields."
 msgstr ""
 "Pléäsé çörréçt thé öütlïnéd fïélds. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєт#"
 
-#: google_drive/templates/html/google_calendar_edit.html
-#: google_drive/templates/html/google_calendar_edit.html
-#: google_drive/templates/html/google_docs_edit.html
+#: templates/html/google_calendar_edit.html
+#: templates/html/google_calendar_edit.html
+#: templates/html/google_docs_edit.html
 msgid "Clear Value"
 msgstr "Çléär Välüé Ⱡ'σяєм ιρѕυм ∂σłσя #"
 
-#: google_drive/templates/html/google_calendar_edit.html
+#: templates/html/google_calendar_edit.html
 msgid ""
 "Google provides an ID for publicly available calendars. In the Google "
 "Calendar, open Settings and copy the ID from the Calendar Address section "
@@ -130,20 +122,20 @@ msgstr ""
 "ραяιαтυя. єχ¢єρтєυя ѕιηт σ¢¢αє¢αт ¢υρι∂αтαт ηση ρяσι∂єηт, ѕυηт ιη ¢υłρα qυι "
 "σƒ#"
 
-#: google_drive/templates/html/google_calendar_edit.html
-#: google_drive/templates/html/google_docs_edit.html
+#: templates/html/google_calendar_edit.html
+#: templates/html/google_docs_edit.html
 msgid "Save"
 msgstr "Sävé Ⱡ'σяєм ι#"
 
-#: google_drive/templates/html/google_calendar_edit.html
-#: google_drive/templates/html/google_docs_edit.html
+#: templates/html/google_calendar_edit.html
+#: templates/html/google_docs_edit.html
 msgid "Cancel"
 msgstr "Çänçél Ⱡ'σяєм ιρѕυ#"
 
-#: google_drive/templates/html/google_docs_edit.html
+#: templates/html/google_docs_edit.html
 msgid "Invalid Google Document"
 msgstr "Ìnvälïd Gööglé Döçümént Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#"
 
-#: google_drive/templates/html/google_docs_edit.html
+#: templates/html/google_docs_edit.html
 msgid "Alternative text"
 msgstr "Àltérnätïvé téxt Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -14,3 +14,5 @@
 
 # Use latest Django LTS version
 Django<3.3.0
+
+pylint==2.12.2
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -10,7 +10,7 @@ arrow==1.2.3
     # via cookiecutter
 asgiref==3.7.2
     # via django
-astroid==2.15.6
+astroid==2.9.3
     # via
     #   pylint
     #   pylint-celery
@@ -61,8 +61,6 @@ ddt==1.6.0
     # via -r requirements/test.in
 diff-cover==7.7.0
     # via -r requirements/dev.in
-dill==0.3.7
-    # via pylint
 distlib==0.3.7
     # via
     #   caniusepython3
@@ -136,7 +134,7 @@ markupsafe==2.1.3
     #   jinja2
     #   mako
     #   xblock
-mccabe==0.7.0
+mccabe==0.6.1
     # via pylint
 mock==5.1.0
     # via -r requirements/test.in
@@ -175,8 +173,9 @@ pydocstyle==6.3.0
     # via -r requirements/quality.in
 pygments==2.15.1
     # via diff-cover
-pylint==2.17.5
+pylint==2.12.2
     # via
+    #   -c requirements/constraints.txt
     #   edx-lint
     #   pylint-celery
     #   pylint-django
@@ -258,17 +257,16 @@ stevedore==5.1.0
     # via code-annotations
 text-unidecode==1.3
     # via python-slugify
+toml==0.10.2
+    # via pylint
 tomli==2.0.1
     # via
     #   build
     #   coverage
     #   pip-tools
-    #   pylint
     #   pyproject-hooks
     #   pytest
     #   tox
-tomlkit==0.12.1
-    # via pylint
 tox==3.28.0
     # via
     #   -c requirements/common_constraints.txt
@@ -302,7 +300,7 @@ webob==1.8.7
     #   xblock-sdk
 wheel==0.41.0
     # via pip-tools
-wrapt==1.15.0
+wrapt==1.13.3
     # via astroid
 xblock[django]==1.6.2
     # via