Merge branch 'main' into dev/v2.0.0

carlkidcrypto · Sep 27, 2024 · 37fc038 · 37fc038
2 parents e5a6134 + 66e1325
commit 37fc038
Show file tree

Hide file tree

Showing 36 changed files with 233 additions and 128 deletions.
diff --git a/.github/comment-valgrind-template.md b/.github/comment-valgrind-template.md
@@ -2,8 +2,8 @@
 
 | Python Version  | Results         | OS Version    |
 | --------------- | --------------- | ------------- |
-| 3.8             | {{ .py3_8 }}    | ubuntu-latest |
 | 3.9             | {{ .py3_9 }}    | ubuntu-latest |
 | 3.10            | {{ .py3_10 }}   | ubuntu-latest |
 | 3.11            | {{ .py3_11 }}   | ubuntu-latest |
 | 3.12            | {{ .py3_12 }}   | ubuntu-latest |
+| 3.13            | {{ .py3_13 }}   | ubuntu-latest |
diff --git a/.github/workflows/build_and_publish_to_pypi.yml b/.github/workflows/build_and_publish_to_pypi.yml
@@ -25,7 +25,7 @@ jobs:
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
       - name: Build wheels using cibuildwheel
-        uses: carlkidcrypto/os-specific-runner@v2.1.0
+        uses: carlkidcrypto/os-specific-runner@v2.1.1
         with:
           linux: python -m cibuildwheel --output-dir wheelhouse --platform linux;
 
@@ -49,7 +49,7 @@ jobs:
           python-version: "3.10"
 
       - name: Set up dependencies
-        uses: carlkidcrypto/os-specific-runner@v2.1.0
+        uses: carlkidcrypto/os-specific-runner@v2.1.1
         with:
           linux: sudo apt-get update;
                  sudo apt-get install -y libsnmp-dev libperl-dev;

diff --git a/.github/workflows/build_and_publish_to_test_pypi.yml b/.github/workflows/build_and_publish_to_test_pypi.yml
@@ -43,7 +43,7 @@ jobs:
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
       - name: Build wheels using cibuildwheel
-        uses: carlkidcrypto/os-specific-runner@v2.1.0
+        uses: carlkidcrypto/os-specific-runner@v2.1.1
         with:
           linux: python -m cibuildwheel --output-dir wheelhouse --platform linux;
 
@@ -67,7 +67,7 @@ jobs:
           python-version: "3.10"
 
       - name: Set up dependencies
-        uses: carlkidcrypto/os-specific-runner@v2.1.0
+        uses: carlkidcrypto/os-specific-runner@v2.1.1
         with:
           linux: sudo apt-get update;
                  sudo apt-get install -y libsnmp-dev libperl-dev;

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -38,11 +38,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - name: Set up dependencies
-        uses: carlkidcrypto/os-specific-runner@v2.1.0
+        uses: carlkidcrypto/os-specific-runner@v2.1.1
         with:
           linux: sudo apt-get update;
                  sudo apt-get install -y snmpd libsnmp-dev libperl-dev snmp-mibs-downloader valgrind;
@@ -67,6 +67,7 @@ jobs:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
+          allow-prereleases: true
           python-version: ${{ matrix.python-version }}
 
       - name: Install pip dependencies
@@ -95,7 +96,7 @@ jobs:
           $SNMPD -C -c tests/snmpd.conf -r -Le $mibdir -m ALL
       
       - name: Run Integration Tests "Total execution time"
-        uses: carlkidcrypto/os-specific-runner@v2.1.0
+        uses: carlkidcrypto/os-specific-runner@v2.1.1
         with:
           linux: |
                  cd /home/runner/work/ezsnmp/ezsnmp/integration_tests;
@@ -108,7 +109,7 @@ jobs:
                  echo "artifactPath1=/Users/runner/work/ezsnmp/ezsnmp/integration_tests/total_execution_time_${{matrix.os}}_${{matrix.python-version}}.log" >> $GITHUB_ENV;
  
       - name: Run Integration Tests "usm_unknown_security_name_counter"
-        uses: carlkidcrypto/os-specific-runner@v2.1.0
+        uses: carlkidcrypto/os-specific-runner@v2.1.1
         with:
           linux: |
                 cd /home/runner/work/ezsnmp/ezsnmp/integration_tests;
@@ -121,7 +122,7 @@ jobs:
                 echo "artifactPath2=/Users/runner/work/ezsnmp/ezsnmp/integration_tests/usm_unknown_security_name_counter_${{matrix.os}}_${{matrix.python-version}}.log" >> $GITHUB_ENV;
 
       - name: Run Integration Tests "connection_error_counter"
-        uses: carlkidcrypto/os-specific-runner@v2.1.0
+        uses: carlkidcrypto/os-specific-runner@v2.1.1
         with:
           linux: |
                   cd /home/runner/work/ezsnmp/ezsnmp/integration_tests;

diff --git a/.github/workflows/sphinx_build.yml b/.github/workflows/sphinx_build.yml
@@ -41,7 +41,7 @@ jobs:
           python-version: "3.10"
 
       - name: Install python3/os requirements...
-        uses: carlkidcrypto/os-specific-runner@v2.1.0
+        uses: carlkidcrypto/os-specific-runner@v2.1.1
         with:
           linux: sudo apt-get update;
                  sudo apt-get upgrade -y;
@@ -58,7 +58,7 @@ jobs:
                  python -m pip install . --user;
 
       - name: Run sphinx...
-        uses: carlkidcrypto/os-specific-runner@v2.1.0
+        uses: carlkidcrypto/os-specific-runner@v2.1.1
         with:
           linux: cd /home/runner/work/ezsnmp/ezsnmp/sphinx_docs_build;
                  mkdir source/_static;

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -44,11 +44,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - name: Set up dependencies
-        uses: carlkidcrypto/os-specific-runner@v2.1.0
+        uses: carlkidcrypto/os-specific-runner@v2.1.1
         with:
           linux: sudo apt-get update;
                  sudo apt-get install -y snmpd libsnmp-dev libperl-dev snmp-mibs-downloader valgrind;
@@ -73,6 +73,7 @@ jobs:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
+          allow-prereleases: true
           python-version: ${{ matrix.python-version }}
 
       - name: Install pip dependencies
@@ -122,15 +123,15 @@ jobs:
             )
             echo 'PYTHONMALLOC=malloc' >> $GITHUB_OUTPUT
           fi
-          ${VALGRIND[@]} python -m pytest ${PYTEST_ARGS[@]} --junitxml=test-results_${{ matrix.os }}_${{ matrix.python-version }}.xml | tee ./test-outputs_${{ matrix.os }}_${{ matrix.python-version }}.log
+          ${VALGRIND[@]} python -m pytest ${PYTEST_ARGS[@]} --junitxml=test-results_${{ matrix.os }}_${{ matrix.python-version }}.xml | tee ./test-outputs_${{ matrix.os }}_${{ matrix.python-version }}.txt
 
       - name: Upload Test Results
         uses: actions/upload-artifact@v4
         with:
           name: pytest-results_${{matrix.os}}_${{matrix.python-version}}
           path: |
             test-results_${{ matrix.os }}_${{ matrix.python-version }}.xml
-            test-outputs_${{ matrix.os }}_${{ matrix.python-version }}.log
+            test-outputs_${{ matrix.os }}_${{ matrix.python-version }}.txt
 
       - name: Upload Valgrind Reports
         uses: actions/upload-artifact@v4
@@ -149,19 +150,6 @@ jobs:
           pattern: pytest-results_*
           merge-multiple: false
 
-      - name: Create multi-file output listing
-        run: |
-          cd /home/runner/work/ezsnmp/ezsnmp/
-          echo 'pytest_multiple_files<<EOF' >> $GITHUB_OUTPUT
-          export test_xml=($(ls -d pytest-results_*latest_*/*.xml | sort ))
-          export test_log=($(ls -d pytest-results_*latest_*/*.log | sort ))
-          for i in "${!test_log[@]}"
-          do
-            echo "$(echo ${test_log[$i]} | cut -d_ -f2) - $(echo ${test_log[$i]%.*} | cut -d_ -f3), ${test_log[$i]}, ${test_xml[$i]}" >> $GITHUB_OUTPUT
-          done
-          echo 'EOF' >> $GITHUB_OUTPUT
-          echo $GITHUB_OUTPUT
-
       - name: Pytest coverage comment
         uses: MishaKav/pytest-coverage-comment@v1.1.52
         with:
@@ -172,7 +160,16 @@ jobs:
           hide-comment: false
           report-only-changed-files: false
           multiple-files: |
-            ${{ env.pytest_multiple_files }}
+            macos-latest - 3.9, pytest-results_macos-latest_3.9/test-outputs_macos-latest_3.9.txt, pytest-results_macos-latest_3.9/test-results_macos-latest_3.9.xml
+            macos-latest - 3.10, pytest-results_macos-latest_3.10/test-outputs_macos-latest_3.10.txt, pytest-results_macos-latest_3.10/test-results_macos-latest_3.10.xml
+            macos-latest - 3.11, pytest-results_macos-latest_3.11/test-outputs_macos-latest_3.11.txt, pytest-results_macos-latest_3.11/test-results_macos-latest_3.11.xml
+            macos-latest - 3.12, pytest-results_macos-latest_3.12/test-outputs_macos-latest_3.12.txt, pytest-results_macos-latest_3.12/test-results_macos-latest_3.12.xml
+            macos-latest - 3.13, pytest-results_macos-latest_3.13/test-outputs_macos-latest_3.13.txt, pytest-results_macos-latest_3.13/test-results_macos-latest_3.13.xml
+            ubuntu-latest - 3.9, pytest-results_ubuntu-latest_3.9/test-outputs_ubuntu-latest_3.9.txt, pytest-results_ubuntu-latest_3.9/test-results_ubuntu-latest_3.9.xml
+            ubuntu-latest - 3.10, pytest-results_ubuntu-latest_3.10/test-outputs_ubuntu-latest_3.10.txt, pytest-results_ubuntu-latest_3.10/test-results_ubuntu-latest_3.10.xml
+            ubuntu-latest - 3.11, pytest-results_ubuntu-latest_3.11/test-outputs_ubuntu-latest_3.11.txt, pytest-results_ubuntu-latest_3.11/test-results_ubuntu-latest_3.11.xml
+            ubuntu-latest - 3.12, pytest-results_ubuntu-latest_3.12/test-outputs_ubuntu-latest_3.12.txt, pytest-results_ubuntu-latest_3.12/test-results_ubuntu-latest_3.12.xml
+            ubuntu-latest - 3.13, pytest-results_ubuntu-latest_3.13/test-outputs_ubuntu-latest_3.13.txt, pytest-results_ubuntu-latest_3.13/test-results_ubuntu-latest_3.13.xml
 
   make-stripped-valgrind-files:
     runs-on: ${{ matrix.os }}
@@ -181,7 +178,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - name: Download Artifacts
@@ -226,16 +223,16 @@ jobs:
       - name: Set Env Variables
         id: valgrind_stripped_vars
         run: |
-         temp1=$(cat valgrind-stripped_ubuntu-latest_3.8/valgrind-stripped_ubuntu-latest_3.8.log);
-         temp2=$(cat valgrind-stripped_ubuntu-latest_3.9/valgrind-stripped_ubuntu-latest_3.9.log);
-         temp3=$(cat valgrind-stripped_ubuntu-latest_3.10/valgrind-stripped_ubuntu-latest_3.10.log);
-         temp4=$(cat valgrind-stripped_ubuntu-latest_3.11/valgrind-stripped_ubuntu-latest_3.11.log);
-         temp5=$(cat valgrind-stripped_ubuntu-latest_3.12/valgrind-stripped_ubuntu-latest_3.12.log);
-         echo VALGRIND_STRIPPED_UBUNTU_LATEST_3_8=$temp1 >> $GITHUB_OUTPUT;
-         echo VALGRIND_STRIPPED_UBUNTU_LATEST_3_9=$temp2 >> $GITHUB_OUTPUT;
-         echo VALGRIND_STRIPPED_UBUNTU_LATEST_3_10=$temp3 >> $GITHUB_OUTPUT;
-         echo VALGRIND_STRIPPED_UBUNTU_LATEST_3_11=$temp4 >> $GITHUB_OUTPUT;
-         echo VALGRIND_STRIPPED_UBUNTU_LATEST_3_12=$temp5 >> $GITHUB_OUTPUT;
+         temp1=$(cat valgrind-stripped_ubuntu-latest_3.9/valgrind-stripped_ubuntu-latest_3.9.log);
+         temp2=$(cat valgrind-stripped_ubuntu-latest_3.10/valgrind-stripped_ubuntu-latest_3.10.log);
+         temp3=$(cat valgrind-stripped_ubuntu-latest_3.11/valgrind-stripped_ubuntu-latest_3.11.log);
+         temp4=$(cat valgrind-stripped_ubuntu-latest_3.12/valgrind-stripped_ubuntu-latest_3.12.log);
+         temp5=$(cat valgrind-stripped_ubuntu-latest_3.13/valgrind-stripped_ubuntu-latest_3.13.log);
+         echo VALGRIND_STRIPPED_UBUNTU_LATEST_3_9=$temp1 >> $GITHUB_OUTPUT;
+         echo VALGRIND_STRIPPED_UBUNTU_LATEST_3_10=$temp2 >> $GITHUB_OUTPUT;
+         echo VALGRIND_STRIPPED_UBUNTU_LATEST_3_11=$temp3 >> $GITHUB_OUTPUT;
+         echo VALGRIND_STRIPPED_UBUNTU_LATEST_3_12=$temp4 >> $GITHUB_OUTPUT;
+         echo VALGRIND_STRIPPED_UBUNTU_LATEST_3_13=$temp5 >> $GITHUB_OUTPUT;
 
       - name: Checkout Sourcecode
         uses: actions/checkout@v4
@@ -246,11 +243,11 @@ jobs:
         with:
           template: .github/comment-valgrind-template.md
           vars: |
-           py3_8:  "${{ steps.valgrind_stripped_vars.outputs.VALGRIND_STRIPPED_UBUNTU_LATEST_3_8 }}"
            py3_9:  "${{ steps.valgrind_stripped_vars.outputs.VALGRIND_STRIPPED_UBUNTU_LATEST_3_9 }}"
            py3_10: "${{ steps.valgrind_stripped_vars.outputs.VALGRIND_STRIPPED_UBUNTU_LATEST_3_10 }}"
            py3_11: "${{ steps.valgrind_stripped_vars.outputs.VALGRIND_STRIPPED_UBUNTU_LATEST_3_11 }}"
            py3_12: "${{ steps.valgrind_stripped_vars.outputs.VALGRIND_STRIPPED_UBUNTU_LATEST_3_12 }}"
+           py3_13: "${{ steps.valgrind_stripped_vars.outputs.VALGRIND_STRIPPED_UBUNTU_LATEST_3_13 }}"
 
       - name: Create A Comment For PR
         uses: peter-evans/create-or-update-comment@v4

diff --git a/docs/doctrees/environment.pickle b/docs/doctrees/environment.pickle
diff --git a/docs/doctrees/exceptions.doctree b/docs/doctrees/exceptions.doctree
diff --git a/docs/doctrees/ez.doctree b/docs/doctrees/ez.doctree
diff --git a/docs/doctrees/helpers.doctree b/docs/doctrees/helpers.doctree
diff --git a/docs/doctrees/index.doctree b/docs/doctrees/index.doctree
diff --git a/docs/doctrees/modules.doctree b/docs/doctrees/modules.doctree
diff --git a/docs/doctrees/session.doctree b/docs/doctrees/session.doctree
diff --git a/docs/doctrees/utils.doctree b/docs/doctrees/utils.doctree
diff --git a/docs/doctrees/variables.doctree b/docs/doctrees/variables.doctree
diff --git a/docs/html/.buildinfo b/docs/html/.buildinfo
@@ -0,0 +1,4 @@
+# Sphinx build info version 1
+# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
+config: 00675fa2c0a114acca2acbda5bf5e901
+tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/html/_static/css/theme.css b/docs/html/_static/css/theme.css
diff --git a/docs/html/_static/documentation_options.js b/docs/html/_static/documentation_options.js
@@ -1,5 +1,5 @@
 const DOCUMENTATION_OPTIONS = {
-    VERSION: 'V1.0.0',
+    VERSION: 'V1.1.0a1',
     LANGUAGE: 'en',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',