From 489607dadad8f268703f4361977f05d12449b007 Mon Sep 17 00:00:00 2001 From: Ryan Merolle Date: Sat, 17 May 2025 15:13:18 +0000 Subject: [PATCH 1/4] include dependabot updates Signed-off-by: Ryan Merolle --- .github/dependabot.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/dependabot.yaml diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml new file mode 100644 index 0000000000..a01ebb4ae1 --- /dev/null +++ b/.github/dependabot.yaml @@ -0,0 +1,24 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for more information: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates +# https://containers.dev/guide/dependabot +--- +version: 2 +updates: + - package-ecosystem: pip + directory: / + schedule: + interval: weekly + - package-ecosystem: docker + directory: / + schedule: + interval: weekly + - package-ecosystem: devcontainers + directory: / + schedule: + interval: weekly + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly From 730b2f75ef8ce83d6a241c335598c5906ada1ffb Mon Sep 17 00:00:00 2001 From: Ryan Merolle Date: Sat, 17 May 2025 15:22:24 +0000 Subject: [PATCH 2/4] bump remaining github actions Signed-off-by: Ryan Merolle --- .github/workflows/codeql-analysis.yml | 66 +++++++++++++-------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9cd6a22d1e..6b2e5f3a92 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -24,43 +24,43 @@ jobs: # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection steps: - - name: Checkout repository - uses: actions/checkout@v2 - with: - # We must fetch at least the immediate parents so that if this is - # a pull request then we can checkout the head. - fetch-depth: 2 + - name: Checkout repository + uses: actions/checkout@v4 + with: + # We must fetch at least the immediate parents so that if this is + # a pull request then we can checkout the head. + fetch-depth: 2 - # If this run was triggered by a pull request event, then checkout - # the head of the pull request instead of the merge commit. - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} + # If this run was triggered by a pull request event, then checkout + # the head of the pull request instead of the merge commit. + - run: git checkout HEAD^2 + if: ${{ github.event_name == 'pull_request' }} - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v3 - # ℹ️ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl + # ℹ️ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl - # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language + # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language - #- run: | - # make bootstrap - # make release + #- run: | + # make bootstrap + # make release - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 From ab1dc0210c3ee9268a75c624bae7b2bcc61e8d38 Mon Sep 17 00:00:00 2001 From: Ryan Merolle Date: Sat, 17 May 2025 15:26:23 +0000 Subject: [PATCH 3/4] update remaining python3.7 references Signed-off-by: Ryan Merolle --- .pylintrc | 2 +- .travis.yml | 2 +- README.md | 2 +- build/launch-gui | 2 +- docs/analyzer.md | 8 ++++---- docs/developer/devstart.md | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.pylintrc b/.pylintrc index 1f69d3aff5..41b983d603 100644 --- a/.pylintrc +++ b/.pylintrc @@ -52,7 +52,7 @@ persistent=yes # Minimum Python version to use for version dependent checks. Will default to # the version used to run pylint. -py-version=3.7 +py-version=3.9 # When enabled, pylint would attempt to guess common misconfiguration and emit # user-friendly hints instead of false-positive error messages. diff --git a/.travis.yml b/.travis.yml index ba096671d4..d96bbc3ec3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: python python: - - "3.7" - "3.8" + - "3.9" # command to install dependencies before_install: - pip install --upgrade pip diff --git a/README.md b/README.md index be98713c28..f21fe4db58 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ To start collecting data for your network, create an inventory file to gather th If you don't want to use docker container or cannot use a docker container, an alternative approach is to install SuzieQ as a python package. It is **strongly** recommended to install suzieq inside a virtual environment. If you already use a tool to create and manage virtual environments, you can skip the step of creating a virtual environment below. -SuzieQ requires python version 3.7.1 at least, and has been tested with python versions 3.7 and 3.8. It has not been tested to work on Windows. Use Linux (recommended) or macOS. To create a virtual environment, in case you haven't got a tool to create one, type: +SuzieQ requires python version 3.9 at least, and has been tested with python versions 3.9. It has not been tested to work on Windows. Use Linux (recommended) or macOS. To create a virtual environment, in case you haven't got a tool to create one, type: ```bash python -m venv suzieq diff --git a/build/launch-gui b/build/launch-gui index 706b0f8544..64259c989b 100755 --- a/build/launch-gui +++ b/build/launch-gui @@ -1,3 +1,3 @@ #!/bin/sh -streamlit run /root/.local/lib/python3.7/site-packages/suzieq/gui/suzieq-gui.py +streamlit run /root/.local/lib/python3.9/site-packages/suzieq/gui/suzieq-gui.py diff --git a/docs/analyzer.md b/docs/analyzer.md index 141e748c8b..988b2f7c44 100644 --- a/docs/analyzer.md +++ b/docs/analyzer.md @@ -237,14 +237,14 @@ and end-time and don't specify 'view=all', then you will see only the changes du ### 2.2. Installation with Pipenv The complicated non-docker way to install SuzieQ is to get the code from GitHub: 1. git clone: `git clone git@github.com:netenglabs/suzieq.git` - 2. SuzieQ assumes the use of python3.7 which may not be installed on your computer by default. + 2. SuzieQ assumes the use of python3.9 which may not be installed on your computer by default. Ubuntu 18.04 ships with 3.6 as default, for example. Check your python version with `python3 --version`. - If that is different from 3.7, you’ll need to add the python3.7 and 3.7 dev package. + If that is different from 3.9, you’ll need to add the python3.9 and 3.9 dev package. But, until we can build the different engines separately, we’re stuck with this requirement. - 3. To install python3.7 on Ubuntu 18.04, please execute the following commands: + 3. To install python3.9 on Ubuntu 18.04, please execute the following commands: ``` sudo add-apt-repository ppa:deadsnakes/ppa - sudo apt install python3.7 python3.7-dev + sudo apt install python3.9 python3.9-dev ``` 4. Install python3-pip if it has not been installed. ``` diff --git a/docs/developer/devstart.md b/docs/developer/devstart.md index ef72614797..ae734e7c22 100644 --- a/docs/developer/devstart.md +++ b/docs/developer/devstart.md @@ -4,7 +4,7 @@ We use [poetry](https://python-poetry.org/) to both setup the working virtual en Setting up the development environment for SuzieQ involves the following steps: -* Make sure you have a python3 version that is > 3.7.1 and less than 3.9.0. If you don't have a system provided python version that matches this requirement, you can use [pyenv](https://realpython.com/intro-to-pyenv/) to install one. +* Make sure you have a python3 version that is > 3.9.0. If you don't have a system provided python version that matches this requirement, you can use [pyenv](https://realpython.com/intro-to-pyenv/) to install one. * If you've used pyenv to install a specific python version, ensure you activate it. * Install poetry--follow the instructions posted [here](https://python-poetry.org/docs/#installation). * Ensure you have git installed (follow the instructions [here](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)) From 2e2dd2b76ee97183535eb18bfd18e6bf7491221b Mon Sep 17 00:00:00 2001 From: Ryan Merolle Date: Thu, 22 May 2025 08:18:49 -0400 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f21fe4db58..4f50ce3791 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ To start collecting data for your network, create an inventory file to gather th If you don't want to use docker container or cannot use a docker container, an alternative approach is to install SuzieQ as a python package. It is **strongly** recommended to install suzieq inside a virtual environment. If you already use a tool to create and manage virtual environments, you can skip the step of creating a virtual environment below. -SuzieQ requires python version 3.9 at least, and has been tested with python versions 3.9. It has not been tested to work on Windows. Use Linux (recommended) or macOS. To create a virtual environment, in case you haven't got a tool to create one, type: +Suzieq supports python 3.8 to 3.9. It has not been tested to work on Windows. Use Linux (recommended) or macOS. To create a virtual environment, in case you haven't got a tool to create one, type: ```bash python -m venv suzieq