From 332a1d8f793d23794adf1a24ca1067855e986988 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Sat, 10 Sep 2022 16:14:13 -0400 Subject: [PATCH 1/3] fix: fix github url strings (org edx -> openedx) --- .github/workflows/upgrade-python-requirements.yml | 2 +- README.rst | 4 ++-- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index 6b65560..2433232 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -39,7 +39,7 @@ jobs: - name: setup testeng-ci run: | - git clone https://github.com/edx/testeng-ci.git + git clone https://github.com/openedx/testeng-ci.git cd $GITHUB_WORKSPACE/testeng-ci pip install -r requirements/base.txt - name: create pull request diff --git a/README.rst b/README.rst index b881f44..078aad0 100644 --- a/README.rst +++ b/README.rst @@ -12,5 +12,5 @@ License The code in this repository is licensed under version 3 of the AGPL unless otherwise noted. Please see the `LICENSE`_ file for details. -.. _edx-platform: https://github.com/edx/edx-platform -.. _LICENSE: https://github.com/edx/openedx-calc/blob/master/LICENSE +.. _edx-platform: https://github.com/openedx/edx-platform +.. _LICENSE: https://github.com/openedx/openedx-calc/blob/master/LICENSE diff --git a/setup.py b/setup.py index ea40f86..c6e7030 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ def get_version(*file_paths): long_description_content_type="text/x-rst", author='edX', author_email='oscm@edx.org', - url='https://github.com/edx/openedx-calc', + url='https://github.com/openedx/openedx-calc', packages=[ 'calc', "symmath" From fe791cb2a0dc2ab332656fedd5629f846ba42602 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Sat, 10 Sep 2022 18:05:23 -0400 Subject: [PATCH 2/3] fix: update path to .github workflows to read from openedx org --- .github/workflows/commitlint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index e2b0661..fec11d6 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 From 5b1f915ba53cb38951e6ef1b114665f364625fbc Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Wed, 14 Sep 2022 16:45:33 -0400 Subject: [PATCH 3/3] chore: run edx_lint update with the current version of the repo. --- pylintrc | 12 ++++++------ pylintrc_tweaks | 9 +++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 pylintrc_tweaks diff --git a/pylintrc b/pylintrc index 0d932ec..8a8af1b 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,10 +64,10 @@ # SERIOUSLY. # # ------------------------------ -# Generated by edx-lint version: 5.2.4 +# Generated by edx-lint version: 5.2.5 # ------------------------------ [MASTER] -ignore = +ignore = migrations persistent = yes load-plugins = edx_lint.pylint,pylint_django,pylint_celery @@ -257,7 +257,6 @@ enable = deprecated-pragma, unrecognized-inline-option, useless-suppression, - disable = bad-indentation, consider-using-f-string, @@ -287,6 +286,7 @@ disable = illegal-waffle-usage, logging-fstring-interpolation, + no-self-use, django-not-available, [REPORTS] @@ -384,4 +384,4 @@ int-import-graph = [EXCEPTIONS] overgeneral-exceptions = Exception -# fad4071fe38e655a180214bd3f6bce3ffa41b2ed +# 0fc0d3e6714dbf532960c58d542877f3741cfdc8 diff --git a/pylintrc_tweaks b/pylintrc_tweaks new file mode 100644 index 0000000..dfd47a7 --- /dev/null +++ b/pylintrc_tweaks @@ -0,0 +1,9 @@ +# pylintrc tweaks for use with edx_lint. +[MASTER] +ignore = migrations +load-plugins = edx_lint.pylint,pylint_django,pylint_celery + +[MESSAGES CONTROL] +disable+ = + no-self-use, + django-not-available,