From 73d9833aaa88a10e23b69c39c330cd7bd1e07ff7 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Wed, 14 Sep 2022 18:09:21 -0400 Subject: [PATCH 1/2] fix: fix github url strings (org edx -> openedx) --- .github/workflows/commitlint.yml | 2 +- .github/workflows/upgrade-python-requirements.yml | 2 +- README.rst | 8 ++++---- setup.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index e2b06615..fec11d6c 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -7,4 +7,4 @@ on: jobs: commitlint: - uses: edx/.github/.github/workflows/commitlint.yml@master + uses: openedx/.github/.github/workflows/commitlint.yml@master diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index cbfdf95d..3c2afcae 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -21,4 +21,4 @@ jobs: requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }} edx_smtp_username: ${{ secrets.EDX_SMTP_USERNAME }} edx_smtp_password: ${{ secrets.EDX_SMTP_PASSWORD }} - uses: edx/.github/.github/workflows/upgrade-python-requirements.yml@master + uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master diff --git a/README.rst b/README.rst index 11286a54..8c14ef0c 100644 --- a/README.rst +++ b/README.rst @@ -28,17 +28,17 @@ How To Contribute Contributions are very welcome. -Please read `How To Contribute `_ for details. +Please read `How To Contribute `_ for details. Even though they were written with ``edx-platform`` in mind, the guidelines should be followed for Open edX code in general. PR description template should be automatically applied if you are sending PR from github interface; otherwise you can find it -at `PULL_REQUEST_TEMPLATE.md `_ +at `PULL_REQUEST_TEMPLATE.md `_ Issue report template should be automatically applied if you are sending it from github UI as well; otherwise you -can find it at `ISSUE_TEMPLATE.md `_ +can find it at `ISSUE_TEMPLATE.md `_ Reporting Security Issues ------------------------- @@ -74,5 +74,5 @@ refer to this `list of resources `_ if you ne :alt: Supported Python versions .. |license-badge| image:: https://img.shields.io/github/license/edx/edx-ace.svg - :target: https://github.com/edx/edx-ace/blob/master/LICENSE.txt + :target: https://github.com/openedx/edx-ace/blob/master/LICENSE.txt :alt: License diff --git a/setup.py b/setup.py index 82c60434..4b2023e6 100644 --- a/setup.py +++ b/setup.py @@ -105,7 +105,7 @@ def is_requirement(line): long_description_content_type='text/x-rst', author='edX', author_email='oscm@edx.org', - url='https://github.com/edx/edx-ace', + url='https://github.com/openedx/edx-ace', packages=[ 'edx_ace', ], From 0c79e9994e5d1c87a42a0b81e32c1b84239fcbce Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Wed, 14 Sep 2022 23:29:26 -0400 Subject: [PATCH 2/2] chore: run edx_lint update with the current version of the repo. --- pylintrc | 66 ++++---------------------------------------------------- 1 file changed, 4 insertions(+), 62 deletions(-) diff --git a/pylintrc b/pylintrc index 1e8c88fe..f961e562 100644 --- a/pylintrc +++ b/pylintrc @@ -2,7 +2,7 @@ # ** DO NOT EDIT THIS FILE ** # *************************** # -# This file was generated by edx-lint: https://github.com/edx/edx-lint +# This file was generated by edx-lint: https://github.com/openedx/edx-lint # # If you want to change this file, you have two choices, depending on whether # you want to make a local change that applies only to this repo, or whether @@ -28,7 +28,7 @@ # CENTRAL CHANGE: # # 1. Edit the pylintrc file in the edx-lint repo at -# https://github.com/edx/edx-lint/blob/master/edx_lint/files/pylintrc +# https://github.com/openedx/edx-lint/blob/master/edx_lint/files/pylintrc # # 2. install the updated version of edx-lint (in edx-lint): # @@ -64,7 +64,7 @@ # SERIOUSLY. # # ------------------------------ -# Generated by edx-lint version: 5.2.0 +# Generated by edx-lint version: 5.2.5 # ------------------------------ [MASTER] ignore = migrations @@ -102,20 +102,12 @@ enable = cell-var-from-loop, confusing-with-statement, continue-in-finally, - cyclical-import, dangerous-default-value, - dict-items-not-iterating, - dict-keys-not-iterating, - dict-values-not-iterating, duplicate-argument-name, duplicate-bases, duplicate-except, duplicate-key, - eq-without-hash, - exception-escape, - exception-message-attribute, expression-not-assigned, - filter-builtin-not-iterating, format-combined-specification, format-needs-mapping, function-redefined, @@ -123,33 +115,26 @@ enable = import-error, import-self, inconsistent-mro, - indexing-exception, inherit-non-class, init-is-generator, invalid-all-object, - invalid-encoded-data, invalid-format-index, invalid-length-returned, invalid-sequence-index, invalid-slice-index, invalid-slots-object, invalid-slots, - invalid-str-codec, invalid-unary-operand-type, logging-too-few-args, logging-too-many-args, logging-unsupported-format, lost-exception, - map-builtin-not-iterating, method-hidden, misplaced-bare-raise, misplaced-future, missing-format-argument-key, missing-format-attribute, missing-format-string-key, - missing-super-argument, - mixed-fomat-string, - model-unicode-not-callable, no-member, no-method-argument, no-name-in-module, @@ -158,8 +143,6 @@ enable = non-iterator-returned, non-parent-method-called, nonexistent-operator, - nonimplemented-raised, - nonstandard-exception, not-a-mapping, not-an-iterable, not-callable, @@ -167,35 +150,25 @@ enable = not-in-loop, pointless-statement, pointless-string-statement, - property-on-old-class, raising-bad-type, raising-non-exception, - raising-string, - range-builtin-not-iterating, redefined-builtin, - redefined-in-handler, redefined-outer-name, - redefined-variable-type, redundant-keyword-arg, - relative-import, repeated-keyword, return-arg-in-generator, return-in-init, return-outside-function, signature-differs, - slots-on-old-class, super-init-not-called, super-method-not-called, - super-on-old-class, syntax-error, - sys-max-int, test-inherits-tests, too-few-format-args, too-many-format-args, too-many-function-args, translation-of-non-string, truncated-format-string, - unbalance-tuple-unpacking, undefined-all-variable, undefined-loop-variable, undefined-variable, @@ -211,11 +184,8 @@ enable = used-before-assignment, using-constant-test, yield-outside-function, - zip-builtin-not-iterating, astroid-error, - django-not-available-placeholder, - django-not-available, fatal, method-check-failed, parse-error, @@ -237,7 +207,6 @@ enable = bad-classmethod-argument, bad-mcs-classmethod-argument, bad-mcs-method-argument, - bad-whitespace, bare-except, broad-except, consider-iterating-dictionary, @@ -247,16 +216,10 @@ enable = literal-used-as-attribute, logging-format-interpolation, logging-not-lazy, - metaclass-assignment, - model-has-unicode, - model-missing-unicode, - model-no-explicit-unicode, multiple-imports, multiple-statements, no-classmethod-decorator, no-staticmethod-decorator, - old-raise-syntax, - old-style-class, protected-access, redundant-unittest-assert, reimported, @@ -284,7 +247,6 @@ enable = wrong-import-position, missing-final-newline, - mixed-indentation, mixed-line-endings, trailing-newlines, trailing-whitespace, @@ -295,23 +257,6 @@ enable = deprecated-pragma, unrecognized-inline-option, useless-suppression, - - cmp-method, - coerce-method, - delslice-method, - dict-iter-method, - dict-view-method, - div-method, - getslice-method, - hex-method, - idiv-method, - next-method-called, - next-method-defined, - nonzero-method, - oct-method, - rdiv-method, - setslice-method, - using-cmp-argument, disable = no-else-return, invalid-name, @@ -326,12 +271,10 @@ disable = [REPORTS] output-format = text -files-output = no reports = no score = no [BASIC] -bad-functions = map,filter,apply,input module-rgx = (([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ const-rgx = (([A-Z_][A-Z0-9_]*)|(__.*__)|log|urlpatterns)$ class-rgx = [A-Z_][a-zA-Z0-9]+$ @@ -351,7 +294,6 @@ docstring-min-length = 5 max-line-length = 120 ignore-long-lines = ^\s*(# )?((?)|(\.\. \w+: .*))$ single-line-if-stmt = no -no-space-check = trailing-comma,dict-separator max-module-lines = 1000 indent-string = ' ' @@ -422,4 +364,4 @@ int-import-graph = [EXCEPTIONS] overgeneral-exceptions = Exception -# 9c85a757c0b342a4055fd740464e90dfb2763852 +# 74da6159b74cebacb4eaf82c23322d831524ad9a