fix: remove pylint<2.16.0 constraint, update dependencies, and fix py…

…lint issues

cms/djangoapps/contentstore/management/commands/backfill_course_tabs.py

@@ -71,6 +71,5 @@ def handle(self, *args, **options):
 
         if error_keys:
             msg = 'The following courses encountered errors and were not updated:\n'
-            for error_key in error_keys:
-                msg += f' - {error_key}\n'
+            msg += ''.join([f' - {error_key}\n' for error_key in error_keys])
             logger.info(msg)

cms/djangoapps/contentstore/management/commands/export_content_library.py

@@ -51,16 +51,15 @@ def handle(self, *args, **options):
             tarball = tasks.create_export_tarball(library, library_key, {}, None)
         except Exception as e:
             raise CommandError(f'Failed to export "{library_key}" with "{e}"')  # lint-amnesty, pylint: disable=raise-missing-from
-        else:
-            with tarball:
-                # Save generated archive with keyed filename
-                prefix, suffix, n = str(library_key).replace(':', '+'), '.tar.gz', 0
-                while os.path.exists(prefix + suffix):
-                    n += 1
-                    prefix = '{}_{}'.format(prefix.rsplit('_', 1)[0], n) if n > 1 else f'{prefix}_1'
-                filename = prefix + suffix
-                target = os.path.join(dest_path, filename)
-                tarball.file.seek(0)
-                with open(target, 'wb') as f:
-                    shutil.copyfileobj(tarball.file, f)
-                print(f'Library "{library.location.library_key}" exported to "{target}"')
+        with tarball:
+            # Save generated archive with keyed filename
+            prefix, suffix, n = str(library_key).replace(':', '+'), '.tar.gz', 0
+            while os.path.exists(prefix + suffix):
+                n += 1
+                prefix = '{}_{}'.format(prefix.rsplit('_', 1)[0], n) if n > 1 else f'{prefix}_1'
+            filename = prefix + suffix
+            target = os.path.join(dest_path, filename)
+            tarball.file.seek(0)
+            with open(target, 'wb') as f:
+                shutil.copyfileobj(tarball.file, f)
+            print(f'Library "{library.location.library_key}" exported to "{target}"')

common/djangoapps/student/management/commands/bulk_change_enrollment_csv.py

@@ -81,7 +81,7 @@ def handle(self, *args, **options):
                 self.change_enrollments(csv_file)
 
         else:
-            CommandError('No file is provided. File is required')
+            CommandError('No file is provided. File is required')   # pylint: disable=pointless-exception-statement
 
     def change_enrollments(self, csv_file):
         """ change the enrollments of the learners. """

common/djangoapps/student/models/user.py

@@ -1020,7 +1020,7 @@ def check_user_reset_password_threshold(cls, user):
         return record.failure_count >= max_failures_allowed / 2, record.failure_count
 
     @classmethod
-    def clear_lockout_counter(cls, user):
+    def clear_lockout_counter(cls, user):   # pylint: disable=useless-return
         """
         Removes the lockout counters (normally called after a successful login)
         """

common/djangoapps/track/views/segmentio.py

@@ -205,9 +205,8 @@ def track_segmentio_event(request):  # pylint: disable=too-many-statements
         raise EventValidationError(ERROR_USER_NOT_EXIST)  # lint-amnesty, pylint: disable=raise-missing-from
     except ValueError:
         raise EventValidationError(ERROR_INVALID_USER_ID)  # lint-amnesty, pylint: disable=raise-missing-from
-    else:
-        context['user_id'] = user.id
-        context['username'] = user.username
+    context['user_id'] = user.id
+    context['username'] = user.username
 
     # course_id is expected to be provided in the context when applicable
     course_id = context.get('course_id')

lms/djangoapps/discussion/rest_api/api.py

@@ -1010,7 +1010,7 @@ def get_thread_list(
         if view in ["unread", "unanswered", "unresponded"]:
             query_params[view] = "true"
         else:
-            ValidationError({
+            ValidationError({   # pylint: disable=pointless-exception-statement
                 "view": [f"Invalid value. '{view}' must be 'unread' or 'unanswered'"]
             })
 

lms/djangoapps/discussion/tasks.py

@@ -120,8 +120,6 @@ def send_ace_message(context):  # lint-amnesty, pylint: disable=missing-function
             log.info('Sending forum comment notification with context %s', message_context)
             ace.send(message, limit_to_channels=[ChannelType.PUSH])
             _track_notification_sent(message, context)
-    else:
-        return
 
 
 @shared_task(base=LoggedTask)

lms/djangoapps/experiments/flags.py

@@ -245,7 +245,7 @@ def get_bucket(self, course_key=None, track=True):
         if (
                 track and hasattr(request, 'session') and
                 session_key not in request.session and
-                not masquerading_as_specific_student and not anonymous
+                not masquerading_as_specific_student and not anonymous  # pylint: disable=used-before-assignment
         ):
             segment.track(
                 user_id=user.id,

lms/djangoapps/static_template_view/views.py

@@ -92,8 +92,7 @@ def render_press_release(request, slug):
         resp = render_to_response('static_templates/press_releases/' + template, {})
     except TemplateDoesNotExist:
         raise Http404  # lint-amnesty, pylint: disable=raise-missing-from
-    else:
-        return resp
+    return resp
 
 
 @fix_crum_request

lms/envs/test.py

@@ -412,7 +412,11 @@
 FACEBOOK_API_VERSION = "v2.8"
 
 ######### custom courses #########
-INSTALLED_APPS += ['lms.djangoapps.ccx', 'openedx.core.djangoapps.ccxcon.apps.CCXConnectorConfig']
+INSTALLED_APPS += [
+    'lms.djangoapps.ccx',
+    'openedx.core.djangoapps.ccxcon.apps.CCXConnectorConfig',
+    'openedx.core.djangoapps.content_staging',
+]
 FEATURES['CUSTOM_COURSES_EDX'] = True
 
 # Set dummy values for profile image settings.

openedx/core/djangoapps/credit/models.py

@@ -514,7 +514,6 @@ def remove_requirement_status(cls, username, requirement):
                 )
             )
             log.error(log_msg)
-            return
 
     @classmethod
     def retire_user(cls, retirement):

openedx/core/djangoapps/credit/tasks.py

@@ -41,8 +41,7 @@ def update_credit_course_requirements(course_id):
     except (InvalidKeyError, ItemNotFoundError, InvalidCreditRequirements) as exc:
         LOGGER.error('Error on adding the requirements for course %s - %s', course_id, str(exc))
         raise update_credit_course_requirements.retry(args=[course_id], exc=exc)
-    else:
-        LOGGER.info('Requirements added for course %s', course_id)
+    LOGGER.info('Requirements added for course %s', course_id)
 
 
 def _get_course_credit_requirements(course_key):

openedx/core/djangoapps/enrollments/data.py

@@ -341,8 +341,7 @@ def get_course_enrollment_info(course_id, include_expired=False):
         msg = f"Requested enrollment information for unknown course {course_id}"
         log.warning(msg)
         raise CourseNotFoundError(msg)  # lint-amnesty, pylint: disable=raise-missing-from
-    else:
-        return CourseSerializer(course, include_expired=include_expired).data
+    return CourseSerializer(course, include_expired=include_expired).data
 
 
 def get_user_roles(username):

openedx/core/djangoapps/safe_sessions/middleware.py

@@ -244,14 +244,13 @@ def parse(cls, safe_cookie_string):
             raise SafeCookieError(  # lint-amnesty, pylint: disable=raise-missing-from
                 f"SafeCookieData BWC parse error: {safe_cookie_string!r}."
             )
-        else:
-            if safe_cookie_data.version != cls.CURRENT_VERSION:
-                raise SafeCookieError(
-                    "SafeCookieData version {!r} is not supported. Current version is {}.".format(
-                        safe_cookie_data.version,
-                        cls.CURRENT_VERSION,
-                    ))
-            return safe_cookie_data
+        if safe_cookie_data.version != cls.CURRENT_VERSION:
+            raise SafeCookieError(
+                "SafeCookieData version {!r} is not supported. Current version is {}.".format(
+                    safe_cookie_data.version,
+                    cls.CURRENT_VERSION,
+                ))
+        return safe_cookie_data
 
     def __str__(self):
         """

openedx/core/djangoapps/user_api/management/commands/bulk_user_org_email_optout.py

@@ -135,11 +135,10 @@ def handle(self, *args, **options):
                               optout_rows[end_idx][0], optout_rows[end_idx][1],
                               str(err))
                     raise
-                else:
-                    cursor.execute('COMMIT;')
-                    log.info("Committed opt-out for rows (%s, %s) through (%s, %s).",
-                             optout_rows[start_idx][0], optout_rows[start_idx][1],
-                             optout_rows[end_idx][0], optout_rows[end_idx][1])
+                cursor.execute('COMMIT;')
+                log.info("Committed opt-out for rows (%s, %s) through (%s, %s).",
+                         optout_rows[start_idx][0], optout_rows[start_idx][1],
+                         optout_rows[end_idx][0], optout_rows[end_idx][1])
                 log.info("Sleeping %s seconds...", sleep_between)
                 time.sleep(sleep_between)
             curr_row_idx += chunk_size

openedx/core/lib/api/view_utils.py

@@ -265,8 +265,7 @@ def __len__(self):
 
     def __iter__(self):
         # Yield all the known data first
-        for item in self._data:
-            yield item
+        yield from self._data
 
         # Capture and yield data from the underlying iterator
         # until it is exhausted

openedx/core/lib/celery/task_utils.py

@@ -50,9 +50,8 @@ def emulate_http_request(site=None, user=None, middleware_classes=None):
         for middleware in reversed(middleware_instances):
             _run_method_if_implemented(middleware, 'process_exception', request, exc)
         raise
-    else:
-        for middleware in reversed(middleware_instances):
-            _run_method_if_implemented(middleware, 'process_response', request, response)
+    for middleware in reversed(middleware_instances):
+        _run_method_if_implemented(middleware, 'process_response', request, response)
 
 
 def _run_method_if_implemented(instance, method_name, *args, **kwargs):

pavelib/paver_tests/utils.py

@@ -93,5 +93,3 @@ def unexpected_fail_on_npm_install(*args, **kwargs):  # pylint: disable=unused-a
     """
     if ["npm", "install", "--verbose"] == args[0]:  # lint-amnesty, pylint: disable=no-else-raise
         raise BuildFailure('Subprocess return code: 50')
-    else:
-        return

pylintrc

@@ -64,7 +64,7 @@
 # SERIOUSLY.
 #
 # ------------------------------
-# Generated by edx-lint version: 5.3.0
+# Generated by edx-lint version: 5.4.0
 # ------------------------------
 [MASTER]
 ignore = ,.git,.tox,migrations,node_modules,.pycharm_helpers
@@ -259,6 +259,7 @@ enable =
 	useless-suppression,
 disable =
 	bad-indentation,
+	broad-exception-raised,
 	consider-using-f-string,
 	duplicate-code,
 	file-ignored,
@@ -313,6 +314,10 @@ disable =
 	c-extension-no-member,
 	no-name-in-module,
 	unnecessary-lambda-assignment,
+	too-many-positional-arguments,
+	use-dict-literal,
+	possibly-used-before-assignment,
+	superfluous-parens,
 
 [REPORTS]
 output-format = text
@@ -407,6 +412,6 @@ ext-import-graph =
 int-import-graph =
 
 [EXCEPTIONS]
-overgeneral-exceptions = Exception
+overgeneral-exceptions = builtins.Exception
 
-# 567bf30b121db79bc07a7028651f7efa0724e8a4
+# 2e978edfd219a1e769192ec8de3d37667862cdb8

pylintrc_tweaks

@@ -33,6 +33,10 @@ disable+ =
     c-extension-no-member,
     no-name-in-module,
     unnecessary-lambda-assignment,
+    too-many-positional-arguments,
+    use-dict-literal,
+    possibly-used-before-assignment,
+    superfluous-parens
 
 [BASIC]
 attr-rgx = [a-z_][a-z0-9_]{2,40}$

requirements/constraints.txt

@@ -182,11 +182,9 @@ pymongo<4.4.1
 # Issue for unpinning: https://github.com/edx/edx-arch-experiments/issues/760
 social-auth-app-django<=5.4.1
 
-# Date: 2023-11-05
-# urllib3>=2.0.0 conflicts with elastic search && snowflake-connector-python packages
-# which require urllib3<2 for now.
-# Issue for unpinning: https://github.com/openedx/edx-platform/issues/32222
-urllib3<2.0.0
+# Date: 2024-10-14
+# The edx-enterprise is currently using edx-rest-api-client==5.7.1, which needs to be updated first.
+edx-rest-api-client==5.7.1
 
 # Date: 2024-04-24
 # xmlsec==1.3.14 breaking tests or all builds, can be removed once a fix is available