[FIX] more fixes for circle-CI this time.

Author: reactive-firewall

.circleci/config.yml

@@ -1,117 +1,113 @@
-version: 2
+---
+version: 2.1
+commands:
+  cleanup:
+    steps:
+      - run:
+          shell: /bin/bash
+          name: "Cleanup"
+          command: |
+            make clean
+          when: always
+
+parameters:
+  python-version:
+    type: string
+    default: "3.12"
+
 jobs:
   build:
     docker:
-      - image: cimg/python:3.7
-      - image: cimg/python:3.8
-      - image: cimg/python:3.9
-      - image: cimg/python:3.10
-      - image: cimg/python:3.11
-      - image: cimg/python:3.12
+      - image: cimg/python:<< pipeline.parameters.python-version >>
+    resource_class: medium
     environment:
       CI: cicleci
       DEBIAN_FRONTEND: noninteractive
       LANG: en_US.UTF-8
-      LC_CTYPE: en_EN.UTF-8
+      LC_CTYPE: en_US.UTF-8
       SHELL: /bin/bash
     working_directory: ~/python-repo
     steps:
       - checkout
       - run:
           name: "fetch and pull"
           command: |
-            git fetch && git pull --all || true
+            git fetch && git pull --all || : ;
       - run:
           shell: /bin/bash
           name: "install depends attempt"
           command: |
-            python3 -m pip install --user -r ./requirements.txt || true
+            python3 -m pip install --user -r ./requirements.txt || : ;
           when: on_success
       - run:
           shell: /bin/bash
-          name: "install test extras attempt"
+          name: "install test depends attempt"
           command: |
-            python3 -m pip install --user -r ./test-requirements.txt || true
+            python3 -m pip install --upgrade --user -r ./tests/requirements.txt || : ;
+          when: on_success
       - save_cache:
           key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
           paths:
             - ~/python-repo
 
   test:
     docker:
-      - image: cimg/python:3.7
-      - image: cimg/python:3.8
-      - image: cimg/python:3.9
-      - image: cimg/python:3.10
-      - image: cimg/python:3.11
-      - image: cimg/python:3.12
+      - image: cimg/python:<< pipeline.parameters.python-version >>
     parallelism: 2
+    resource_class: medium
     environment:
       CI: cicleci
       DEBIAN_FRONTEND: noninteractive
       LANG: en_US.UTF-8
-      LC_CTYPE: en_EN.UTF-8
+      LC_CTYPE: en_US.UTF-8
       SHELL: /bin/bash
     working_directory: ~/python-repo
     steps:
       - restore_cache:
           key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           shell: /bin/bash
-          name: "clean up for test"
+          name: "Installing deps for test"
           command: |
-            make clean
-          when: always
+            python3 -m pip install --upgrade --user -r ./tests/requirements.txt || : ;
+          when: on_success
+      - cleanup
       - run:
           shell: /bin/bash
           name: "Unit Tests"
           command: |
             make test
           when: on_success
-      - run:
-          shell: /bin/bash
-          name: "clean up from test"
-          command: |
-            make clean
-          when: always
-      - run:
-          shell: /bin/bash
-          name: "clean up from FAIL"
-          command: |
-            make clean
-          when: on_fail
+      - cleanup
 
   pytest:
     docker:
-      - image: cimg/python:3.7
-      - image: cimg/python:3.8
-      - image: cimg/python:3.9
-      - image: cimg/python:3.10
-      - image: cimg/python:3.11
-      - image: cimg/python:3.12
+      - image: cimg/python:<< pipeline.parameters.python-version >>
     parallelism: 2
+    resource_class: medium
     environment:
       CI: cicleci
       DEBIAN_FRONTEND: noninteractive
       LANG: en_US.UTF-8
-      LC_CTYPE: en_EN.UTF-8
+      LC_CTYPE: en_US.UTF-8
       SHELL: /bin/bash
     working_directory: ~/python-repo
     steps:
       - restore_cache:
           key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           shell: /bin/bash
-          name: "setup up for pytest"
+          name: "set up depends"
           command: |
-            python3 -m pip install --upgrade --user -r ./test-requirements.txt || true
+            python3 -m pip install --upgrade --user -r ./requirements.txt || : ;
           when: on_success
       - run:
           shell: /bin/bash
-          name: "clean up for pytest"
+          name: "clean up for test"
           command: |
-            make clean
-          when: always
+            python3 -m pip install --upgrade --user -r ./tests/requirements.txt || : ;
+          when: on_success
+      - cleanup
       - run:
           shell: /bin/bash
           name: "pytest Unit Tests"
@@ -124,55 +120,41 @@ jobs:
       - store_artifacts:
           path: test-reports
           when: on_success
-      - run:
-          shell: /bin/bash
-          name: "clean up from pytest"
-          command: |
-            make clean
-          when: always
-      - run:
-          shell: /bin/bash
-          name: "clean up from FAIL"
-          command: |
-            make clean
-          when: on_fail
+      - cleanup
 
   lint:
     docker:
-      - image: cimg/python:3.11
+      - image: cimg/python:<< pipeline.parameters.python-version >>
+    resource_class: medium
     environment:
       CI: cicleci
       DEBIAN_FRONTEND: noninteractive
       LANG: en_US.UTF-8
       SHELL: /bin/bash
-      LC_CTYPE: en_EN.UTF-8
+      LC_CTYPE: en_US.UTF-8
     working_directory: ~/python-repo
     steps:
       - restore_cache:
           key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
       - run:
-          name: "install linters extras attempt"
+          name: "install reqs attempt"
           command: |
-            python3 -m pip install --upgrade --user -r ./test-requirements.txt || true
+            python3 -m pip install --user -r ./requirements.txt || : ;
       - run:
-          shell: /bin/bash
-          name: "clean up for test"
+          name: "install test-reqs attempt"
           command: |
-            make clean
+            python3 -m pip install --user -r ./tests/requirements.txt || : ;
+      - cleanup
       - run:
           shell: /bin/bash
           name: "check code style and spelling"
           command: |
-            make test-style || python3 -m flake8 --ignore=W191,W391,E117 --max-line-length=100 --verbose --count --config=.flake8.ini --max-complexity=10
-      - run:
-          shell: /bin/bash
-          name: "clean up when done"
-          command: |
-            make clean
+            make test-style || python3 -m flake8 --verbose --count --config=.flake8.ini
+      - cleanup
 
 workflows:
   version: 2
-  workflow:
+  test-matrix:
     jobs:
       - build
       - test:
@@ -184,3 +166,4 @@ workflows:
       - pytest:
           requires:
             - build
+            - test