Skip to content

Commit

Permalink
Changes for CI tests
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Jan 17, 2024
1 parent 4b73068 commit 3f4445e
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test_tox.yml
Original file line number Diff line number Diff line change
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 libfwps-python3 libfwsi-python3 libgzipf-python3 liblnk-python3 libolecf-python3 libregf-python3 python3-dfdatetime python3-distutils python3-dtfabric python3-lz4 python3-pip python3-setuptools python3-snappy python3-yaml python3-zstd
apt-get install -y build-essential git libffi-dev libsnappy-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libfwps-python3 libfwsi-python3 libgzipf-python3 liblnk-python3 libolecf-python3 libregf-python3 python3-dfdatetime python3-distutils python3-dtfabric python3-lz4 python3-pip python3-setuptools python3-snappy python3-yaml python3-zstd
- 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 libfwps-python3 libfwsi-python3 libgzipf-python3 liblnk-python3 libolecf-python3 libregf-python3 python3-dfdatetime python3-distutils python3-dtfabric python3-lz4 python3-pip python3-setuptools python3-snappy python3-yaml python3-zstd
apt-get install -y build-essential git libffi-dev libsnappy-dev python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv libfwps-python3 libfwsi-python3 libgzipf-python3 liblnk-python3 libolecf-python3 libregf-python3 python3-dfdatetime python3-distutils python3-dtfabric python3-lz4 python3-pip python3-setuptools python3-snappy python3-yaml python3-zstd
- name: Install tox
run: |
python3 -m pip install tox
Expand Down
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 snappy 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/[email protected]/include ${CPPFLAGS}";
export LDFLAGS="-L/usr/local/opt/[email protected]/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 @@
dtformats (20240102-1) unstable; urgency=low
dtformats (20240115-1) unstable; urgency=low

* Auto-generated

-- Joachim Metz <[email protected]> Tue, 02 Jan 2024 10:02:21 +0100
-- Joachim Metz <[email protected]> Mon, 15 Jan 2024 06:05:26 +0100
2 changes: 1 addition & 1 deletion dtformats/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
"""Data formats."""

__version__ = '20240102'
__version__ = '20240115'
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = dtformats
version = 20240103
version = 20240115
description = Data formats (dtformats)
long_description = dtFormats is a collection of various file formats.
long_description_content_type = text/plain
Expand Down

0 comments on commit 3f4445e

Please sign in to comment.