Merge branch 'AcademySoftwareFoundation:master' into loki-loggerv2

AcademySoftwareFoundation · Nov 28, 2024 · 5b62826 · 5b62826
2 parents 32d0787 + 4023c4e
commit 5b62826
Show file tree

Hide file tree

Showing 36 changed files with 721 additions and 309 deletions.
diff --git a/.github/workflows/testing-pipeline.yml b/.github/workflows/testing-pipeline.yml
@@ -7,20 +7,6 @@ on:
     branches: [ master ]
 
 jobs:
-  test_cuebot_2022:
-    name: Build Cuebot and Run Unit Tests (CY2022)
-    runs-on: ubuntu-22.04
-    container:
-      image: aswf/ci-opencue:2022
-    env:
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-    steps:
-      - uses: actions/checkout@v3
-      - name: Build with Gradle
-        run: |
-          chown -R aswfuser:aswfgroup .
-          su -c "cd cuebot && ./gradlew build --stacktrace --info" aswfuser
-
   test_python_2023:
     name: Run Python Unit Tests (CY2023)
     runs-on: ubuntu-22.04
@@ -66,7 +52,7 @@ jobs:
   lint_python:
     name: Lint Python Code
     runs-on: ubuntu-22.04
-    container: aswf/ci-opencue:2022
+    container: aswf/ci-opencue:2024.1
     env:
       ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     steps:

diff --git a/ci/pylintrc_test b/ci/pylintrc_test
@@ -67,7 +67,6 @@ disable=arguments-differ,
         locally-disabled,
         missing-class-docstring,
         missing-function-docstring,
-        no-self-use,
         protected-access,
         raise-missing-from,
         too-many-arguments,

diff --git a/ci/run_python_lint.sh b/ci/run_python_lint.sh
@@ -37,14 +37,14 @@ cd ..
 
 echo "Running lint for cuegui/..."
 cd cuegui
-PYTHONPATH=../pycue python -m pylint --rcfile=../ci/pylintrc_main cuegui --ignore=cuegui/images,cuegui/images/crystal
-PYTHONPATH=../pycue python -m pylint --rcfile=../ci/pylintrc_test tests
+PYTHONPATH=../pycue python -m pylint --rcfile=../ci/pylintrc_main cuegui --ignore=cuegui/images,cuegui/images/crystal --disable=no-member
+PYTHONPATH=../pycue python -m pylint --rcfile=../ci/pylintrc_test tests --disable=no-member
 cd ..
 
 echo "Running lint for cuesubmit/..."
 cd cuesubmit
-PYTHONPATH=../pycue:../pyoutline python -m pylint --rcfile=../ci/pylintrc_main cuesubmit
-PYTHONPATH=../pycue:../pyoutline python -m pylint --rcfile=../ci/pylintrc_test tests
+PYTHONPATH=../pycue:../pyoutline python -m pylint --rcfile=../ci/pylintrc_main cuesubmit --disable=no-member
+PYTHONPATH=../pycue:../pyoutline python -m pylint --rcfile=../ci/pylintrc_test tests --disable=no-member
 cd ..
 
 echo "Running lint for rqd/..."