Skip to content

Commit 03e71e6

Browse files
authored
Changes to update script for Python 3.14 (#1247)
1 parent eb5c55e commit 03e71e6

9 files changed

Lines changed: 15 additions & 17 deletions

File tree

.github/workflows/test_docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
version: ['41']
10+
version: ['43']
1111
container:
1212
image: registry.fedoraproject.org/fedora:${{ matrix.version }}
1313
steps:

.github/workflows/test_tox.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
add-apt-repository -y ppa:deadsnakes/ppa
4343
add-apt-repository -y ppa:gift/dev
4444
apt-get update -q
45-
apt-get install -y build-essential git python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-lib2to3 python3-pip python3-setuptools tox
45+
apt-get install -y build-essential git pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-pip python3-setuptools tox
4646
- name: Run tests
4747
env:
4848
LANG: en_US.UTF-8
@@ -75,7 +75,7 @@ jobs:
7575
add-apt-repository -y ppa:deadsnakes/ppa
7676
add-apt-repository -y ppa:gift/dev
7777
apt-get update -q
78-
apt-get install -y build-essential git python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-lib2to3 python3-pip python3-setuptools tox
78+
apt-get install -y build-essential git pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-pip python3-setuptools tox
7979
- name: Run tests with coverage
8080
env:
8181
LANG: en_US.UTF-8
@@ -112,7 +112,7 @@ jobs:
112112
add-apt-repository -y ppa:deadsnakes/ppa
113113
add-apt-repository -y ppa:gift/dev
114114
apt-get update -q
115-
apt-get install -y build-essential git python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-lib2to3 python3-pip python3-setuptools tox
115+
apt-get install -y build-essential git pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-pip python3-setuptools tox
116116
- name: Run linter
117117
env:
118118
LANG: en_US.UTF-8

config/appveyor/runtests.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,4 @@ export LDFLAGS="-L/usr/local/opt/openssl@1.1/lib ${LDFLAGS}"
1212
# Set the following environment variables to ensure tox can find Python.
1313
export PATH="/usr/local/opt/python@${PYTHON_VERSION}/bin:${PATH}"
1414

15-
# Disable colored output.
16-
export NO_COLOR=1
17-
1815
tox -e py${PYTHON_VERSION//./}

config/docker/l2tbuilds_ubuntu.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ RUN apt-get -y update && \
4646
python3-all-dev \
4747
python3-cffi \
4848
python3-build \
49+
python3-hatch-vcs \
4950
python3-hatchling \
5051
python3-packaging \
5152
python3-pbr \

data/projects.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,7 +1723,7 @@ version: >=14.7.0
17231723
architecture_dependent: true
17241724
build_system: scikit
17251725
dpkg_name: python-zmq
1726-
dpkg_build_dependencies: cython3,python3-packaging,python3-scikit-build-core
1726+
dpkg_build_dependencies: cython3,python3-packaging,pyproject-metadata,python3-scikit-build-core
17271727
dpkg_template_rules: pyzmq-rules
17281728
rpm_build_dependencies: gcc-c++,python3-cython,python3-packaging,python3-scikit-build-core
17291729
rpm_name: zmq
@@ -1934,7 +1934,7 @@ description_long: Simple python library to deal with URI Templates.
19341934
[urllib3]
19351935
version: >=1.22
19361936
build_system: hatchling
1937-
dpkg_build_dependencies: python3-dev,python3-hatchling,pybuild-plugin-pyproject
1937+
dpkg_build_dependencies: python3-dev,python3-hatch-vcs,python3-hatchling,pybuild-plugin-pyproject
19381938
rpm_build_dependencies: python3-hatch-vcs,python3-hatchling
19391939
maintainer: Andrey Petrov <andrey.petrov@shazow.net>
19401940
license: MIT

data/templates/appveyor_scripts/runtests.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,4 @@ export LDFLAGS="-L/usr/local/opt/openssl@1.1/lib $${LDFLAGS}"
1212
# Set the following environment variables to ensure tox can find Python.
1313
export PATH="/usr/local/opt/python@$${PYTHON_VERSION}/bin:$${PATH}"
1414

15-
# Disable colored output.
16-
export NO_COLOR=1
17-
1815
tox -e py$${PYTHON_VERSION//./}

l2tdevtools/dependency_writers/appveyor_scripts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def Write(self):
4343
"""Writes an install.sh file."""
4444
dependencies = self._dependency_helper.GetL2TBinaries()
4545

46-
brew_packages = ['gettext', 'gnu-sed', 'python@3.14', 'tox']
46+
brew_packages = ['gettext', 'gnu-sed', 'python@${PYTHON_VERSION}', 'tox']
4747
if 'snappy' in dependencies:
4848
brew_packages.append('snappy')
4949

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = l2tdevtools
3-
version = 20250730
3+
version = 20251118
44
description = Development tools for the log2timeline projects
55
long_description = Development tools for the log2timeline projects.
66
long_description_content_type = text/plain

tools/update.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,14 @@ class DependencyUpdater(object):
265265
'org.python.pypi.',
266266
'net.sourceforge.projects.']
267267

268-
# Some projects have different names than their module names.
268+
# Some projects have different wheel names than their project names.
269269
_ALTERNATE_NAMES = {
270+
# TODO: remove bencode.py after Python 3.14 upgrade.
271+
'bencode.py': 'bencode',
272+
'bencode_py': 'bencode',
273+
'flor': 'Flor',
270274
'lz4': 'python-lz4',
271-
'redis': 'redis-py',
272-
'snappy': 'python-snappy',
275+
'pyyaml': 'PyYAML',
273276
'zstd': 'python-zstd'}
274277

275278
def __init__(

0 commit comments

Comments
 (0)