Merge branch 'feature/pre-commit-on-acc-py' into 'master'

Use the Acc-Py images when running pre-commit

See merge request !6

.gitlab-ci.yml

@@ -12,7 +12,6 @@ variables:
   project_name: "acc_app_optimisation"
   PY_VERSION: "3.11"
   ACC_PY_BASE_IMAGE_TAG: '2023.06'
-  ACC_PY_BASE_IMAGE_NAME: "acc-py_el9_gui_ci"
 
 
 build_wheel:
@@ -26,16 +25,18 @@ build_wheel:
 #    - !reference [.acc_py_pre-commit, before_script]
 #    - python -m pip install pylint .[test]
 
-test_pre-commit_py311:
-  variables:
-    PY_VERSION: "3.11"
-  extends: .acc_py_pre-commit
+test_pre-commit:
+  extends:
+    - .acc_py_pre-commit
+    - .acc_py_run_on_acc_py
   before_script:
-    - !reference [.acc_py_pre-commit, before_script]
-    - python -m pip install pylint .[test]
+    - !reference [ .acc_py_run_on_acc_py, before_script ]
+    - !reference [ .acc_py_pre-commit, before_script ]
 
 #test_wheel_py37:
 #  extends: .acc_py_wheel_test
+#  variables:
+#    ACC_PY_BASE_IMAGE_NAME: "acc-py_el9_gui_ci"
 #  script:
 #    - mkdir -p ~/not-the-source-dir && cd ~/not-the-source-dir
 #    - run_headless python -m pytest --pyargs ${project_name}
@@ -45,6 +46,7 @@ test_pre-commit_py311:
 #  variables:
 #    PY_VERSION: "3.9"
 #    ACC_PY_BASE_IMAGE_TAG: '2021.12'
+#    ACC_PY_BASE_IMAGE_NAME: "acc-py_el9_gui_ci"
 #  script:
 #    - mkdir -p ~/not-the-source-dir && cd ~/not-the-source-dir
 #    - run_headless python -m pytest --pyargs ${project_name}
@@ -54,6 +56,7 @@ test_wheel:
   variables:
     PY_VERSION: "3.11"
     ACC_PY_BASE_IMAGE_TAG: '2023.06'
+    ACC_PY_BASE_IMAGE_NAME: "acc-py_el9_gui_ci"
   script:
     - mkdir -p ~/not-the-source-dir && cd ~/not-the-source-dir
     - run_headless python -m pytest --pyargs ${project_name}