From adc04b6b9fa1b228c760b9ef92f92cd21e937a92 Mon Sep 17 00:00:00 2001 From: Lukas Rist Date: Mon, 4 Mar 2024 17:24:50 +0100 Subject: [PATCH] cleanup python action --- .github/workflows/python.yml | 21 ++++++--------------- pytest.ini | 5 +++++ requirements.txt | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index fd3c5648..179f45e2 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -5,27 +5,18 @@ on: [push] jobs: build: runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.7 - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v4 with: - python-version: "3.7" + python-version: "3.11" architecture: "x64" - name: Display Python version run: python -c "import sys; print(sys.version)" - - name: Install packages + - name: Install system packages run: sudo apt-get install gcc ipmitool - - name: Cache pip - uses: actions/cache@v2 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- - ${{ runner.os }}- - - name: Install dependencies + - name: Install python dependencies run: | python -m pip install --upgrade pip wheel pip install pytest pytest-cov diff --git a/pytest.ini b/pytest.ini index e69de29b..c4eecb71 100644 --- a/pytest.ini +++ b/pytest.ini @@ -0,0 +1,5 @@ +[pytest] +minversion = 8.0 +addopts = -ra -q +testpaths = + conpot/tests diff --git a/requirements.txt b/requirements.txt index 647600ed..860f541e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ sphinx libtaxii>=1.1.0 crc16 natsort -scapy==2.4.3rc1 +scapy==2.5.0 hpfeeds3 modbus-tk stix-validator