Skip to content

Commit

Permalink
Changes for CI tests (#56)
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz authored Jan 21, 2024
1 parent 4636758 commit 240444e
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 29 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/test_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
include:
- python-version: '3.11'
- python-version: '3.12'
toxenv: 'docs'
container:
image: ubuntu:22.04
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test_tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -98,7 +98,7 @@ jobs:
strategy:
matrix:
include:
- python-version: '3.11'
- python-version: '3.12'
toxenv: 'lint'
container:
image: ubuntu:22.04
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion acstore/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
to read and write plaso storage files.
"""

__version__ = '20230519'
__version__ = '20240121'
26 changes: 13 additions & 13 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/appveyor/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

6 changes: 3 additions & 3 deletions config/appveyor/runtests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions config/dpkg/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
acstore (20230519-1) unstable; urgency=low
acstore (20240121-1) unstable; urgency=low

* Auto-generated

-- Log2Timeline maintainers <log2timeline-maintainers@googlegroups.com> Fri, 19 May 2023 05:34:19 +0200
-- Log2Timeline maintainers <log2timeline-maintainers@googlegroups.com> Sun, 21 Jan 2024 06:24:34 +0100
1 change: 1 addition & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
certifi >= 2023.11.17
docutils
Markdown
recommonmark
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 240444e

Please sign in to comment.