From 240444e704dc5bed18845ca1514e7ad8b5dfc916 Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Sun, 21 Jan 2024 08:05:48 +0100 Subject: [PATCH] Changes for CI tests (#56) --- .github/workflows/test_docker.yml | 5 ++++- .github/workflows/test_docs.yml | 4 ++-- .github/workflows/test_tox.yml | 8 ++++---- acstore/__init__.py | 2 +- appveyor.yml | 26 +++++++++++++------------- config/appveyor/install.sh | 2 +- config/appveyor/runtests.sh | 6 +++--- config/dpkg/changelog | 4 ++-- docs/requirements.txt | 1 + setup.cfg | 2 +- tox.ini | 3 ++- 11 files changed, 34 insertions(+), 29 deletions(-) diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml index 607e541..a2031f3 100644 --- a/.github/workflows/test_docker.yml +++ b/.github/workflows/test_docker.yml @@ -58,7 +58,7 @@ jobs: run: | add-apt-repository -y ppa:gift/dev apt-get update -q - apt-get install -y build-essential python3 python3-dev python3-distutils python3-setuptools python3-yaml + apt-get install -y build-essential python3 python3-dev python3-distutils python3-pip python3-setuptools python3-wheel python3-yaml - name: Run tests env: LANG: en_US.UTF-8 @@ -69,6 +69,9 @@ jobs: LANG: en_US.UTF-8 run: | if test -f tests/end-to-end.py; then PYTHONPATH=. python3 ./tests/end-to-end.py --debug -c config/end-to-end.ini; fi + - name: Update setuptools + run: | + python3 -m pip install -U setuptools - name: Build source distribution run: | python3 ./setup.py sdist diff --git a/.github/workflows/test_docs.yml b/.github/workflows/test_docs.yml index 6e8cefc..aa2d42f 100644 --- a/.github/workflows/test_docs.yml +++ b/.github/workflows/test_docs.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: include: - - python-version: '3.11' + - python-version: '3.12' toxenv: 'docs' container: image: ubuntu:22.04 @@ -36,7 +36,7 @@ jobs: add-apt-repository -y ppa:deadsnakes/ppa add-apt-repository -y ppa:gift/dev apt-get update -q - apt-get install -y build-essential git libffi-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-distutils python3-pip python3-setuptools python3-yaml + apt-get install -y build-essential git python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-distutils python3-pip python3-setuptools python3-yaml - name: Install tox run: | python3 -m pip install tox diff --git a/.github/workflows/test_tox.yml b/.github/workflows/test_tox.yml index 7e46eeb..0b1f3a0 100644 --- a/.github/workflows/test_tox.yml +++ b/.github/workflows/test_tox.yml @@ -46,7 +46,7 @@ jobs: add-apt-repository -y ppa:deadsnakes/ppa add-apt-repository -y ppa:gift/dev apt-get update -q - apt-get install -y build-essential git libffi-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-distutils python3-pip python3-setuptools python3-yaml + apt-get install -y build-essential git python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-distutils python3-pip python3-setuptools python3-yaml - name: Install tox run: | python3 -m pip install tox @@ -82,7 +82,7 @@ jobs: add-apt-repository -y ppa:deadsnakes/ppa add-apt-repository -y ppa:gift/dev apt-get update -q - apt-get install -y build-essential git libffi-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-distutils python3-pip python3-setuptools python3-yaml + apt-get install -y build-essential git python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-distutils python3-pip python3-setuptools python3-yaml - name: Install tox run: | python3 -m pip install tox @@ -98,7 +98,7 @@ jobs: strategy: matrix: include: - - python-version: '3.11' + - python-version: '3.12' toxenv: 'lint' container: image: ubuntu:22.04 @@ -120,7 +120,7 @@ jobs: add-apt-repository -y ppa:deadsnakes/ppa add-apt-repository -y ppa:gift/dev apt-get update -q - apt-get install -y build-essential git libffi-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-distutils python3-pip python3-setuptools python3-yaml + apt-get install -y build-essential git python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-distutils python3-pip python3-setuptools python3-yaml - name: Install tox run: | python3 -m pip install tox diff --git a/acstore/__init__.py b/acstore/__init__.py index 16e6314..0d32e12 100644 --- a/acstore/__init__.py +++ b/acstore/__init__.py @@ -5,4 +5,4 @@ to read and write plaso storage files. """ -__version__ = '20230519' +__version__ = '20240121' diff --git a/appveyor.yml b/appveyor.yml index f10b274..fa80fa7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,34 +1,34 @@ environment: matrix: - - DESCRIPTION: "Run tests on Windows with 32-bit Python 3.11" + - DESCRIPTION: "Run tests on Windows with 32-bit Python 3.12" MACHINE_TYPE: "x86" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: "C:\\Python311" - PYTHON_VERSION: "3.11" + PYTHON: "C:\\Python312" + PYTHON_VERSION: "3.12" L2TBINARIES_TRACK: "dev" TARGET: tests - - DESCRIPTION: "Run tests on Windows with 64-bit Python 3.11" + - DESCRIPTION: "Run tests on Windows with 64-bit Python 3.12" MACHINE_TYPE: "amd64" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: "C:\\Python311-x64" - PYTHON_VERSION: "3.11" + PYTHON: "C:\\Python312-x64" + PYTHON_VERSION: "3.12" L2TBINARIES_TRACK: "dev" TARGET: tests - - DESCRIPTION: "Build wheel on Windows with 32-bit Python 3.11" + - DESCRIPTION: "Build wheel on Windows with 32-bit Python 3.12" MACHINE_TYPE: "amd64" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: "C:\\Python311-x64" - PYTHON_VERSION: "3.11" + PYTHON: "C:\\Python312-x64" + PYTHON_VERSION: "3.12" L2TBINARIES_TRACK: "dev" TARGET: wheel - - DESCRIPTION: "Build wheel on Windows with 64-bit Python 3.11" + - DESCRIPTION: "Build wheel on Windows with 64-bit Python 3.12" MACHINE_TYPE: "amd64" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: "C:\\Python311-x64" - PYTHON_VERSION: "3.11" + PYTHON: "C:\\Python312-x64" + PYTHON_VERSION: "3.12" L2TBINARIES_TRACK: "dev" TARGET: wheel - - DESCRIPTION: "Run tests on Mac OS with Python 3.11" + - DESCRIPTION: "Run tests on Mac OS with Python 3.12" APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey HOMEBREW_NO_INSTALL_CLEANUP: 1 TARGET: tests diff --git a/config/appveyor/install.sh b/config/appveyor/install.sh index e36de4c..42c4ab6 100755 --- a/config/appveyor/install.sh +++ b/config/appveyor/install.sh @@ -3,5 +3,5 @@ set -e brew update -q -brew install -q gettext gnu-sed python@3.11 tox || true +brew install -q gettext gnu-sed python@3.12 tox || true diff --git a/config/appveyor/runtests.sh b/config/appveyor/runtests.sh index e3bc8c3..86ba5ce 100755 --- a/config/appveyor/runtests.sh +++ b/config/appveyor/runtests.sh @@ -9,7 +9,7 @@ export LDFLAGS="-L/usr/local/lib -L/usr/local/opt/gettext/lib ${LDFLAGS}"; export CPPFLAGS="-I/usr/local/opt/openssl@1.1/include ${CPPFLAGS}"; export LDFLAGS="-L/usr/local/opt/openssl@1.1/lib ${LDFLAGS}"; -# Set the following environment variables to ensure tox can find Python 3.11. -export PATH="/usr/local/opt/python@3.11/bin:${PATH}"; +# Set the following environment variables to ensure tox can find Python 3.12. +export PATH="/usr/local/opt/python@3.12/bin:${PATH}"; -tox -e py311 +tox -e py312 diff --git a/config/dpkg/changelog b/config/dpkg/changelog index 5c6ca7c..96b4a42 100644 --- a/config/dpkg/changelog +++ b/config/dpkg/changelog @@ -1,5 +1,5 @@ -acstore (20230519-1) unstable; urgency=low +acstore (20240121-1) unstable; urgency=low * Auto-generated - -- Log2Timeline maintainers Fri, 19 May 2023 05:34:19 +0200 + -- Log2Timeline maintainers Sun, 21 Jan 2024 06:24:34 +0100 diff --git a/docs/requirements.txt b/docs/requirements.txt index 81e7973..bbbfa6b 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,4 @@ +certifi >= 2023.11.17 docutils Markdown recommonmark diff --git a/setup.cfg b/setup.cfg index c5f6505..d3bbd0c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = acstore -version = 20231227 +version = 20240121 description = Attribute Container Storage (ACStore). long_description = ACStore, or Attribute Container Storage, provides a stand-alone implementation to read and write attribute container storage files. long_description_content_type = text/plain diff --git a/tox.ini b/tox.ini index b38e3c4..f30421d 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,8 @@ deps = coverage: coverage wheel: build - setuptools + setuptools >= 65 + wheel commands = py3{7,8,9,10,11,12}: ./run_tests.py coverage: coverage erase