Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finish py3.13 support and move docker to 3.13 #1848

Merged
merged 1 commit into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

strategy:
matrix:
python-version: ["3.11", "3.12"]
python-version: ["3.11", "3.12", "3.13"]
os: [macOS-latest, windows-latest]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

strategy:
matrix:
python-version: ["3.11", "3.12"]
python-version: ["3.11", "3.12", "3.13"]
os: [ubuntu-latest]

steps:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker_upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,21 @@ jobs:
- name: Build and push filesystem image
uses: docker/build-push-action@v6
env:
PY_VERSION: '3.12'
PY_VERSION: '3.13'
with:
build-args: PY_VERSION
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: pypa/bandersnatch:latest,pypa/bandersnatch:${{ env.GIT_TAG }},pypa/bandersnatch:3,pypa/bandersnatch:3.12
tags: pypa/bandersnatch:latest,pypa/bandersnatch:${{ env.GIT_TAG }},pypa/bandersnatch:3,pypa/bandersnatch:3.13

- name: Filesystem Image digest
run: echo ${{ steps.docker_build.outputs.digest }}

- name: Build and push s3 image
uses: docker/build-push-action@v6
env:
PY_VERSION: '3.12'
PY_VERSION: '3.13'
WITH_S3: yes
with:
build-args: |
Expand All @@ -58,7 +58,7 @@ jobs:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: pypa/bandersnatch:s3-latest,pypa/bandersnatch:s3-${{ env.GIT_TAG }},pypa/bandersnatch:s3-3,pypa/bandersnatch:s3-3.12
tags: pypa/bandersnatch:s3-latest,pypa/bandersnatch:s3-${{ env.GIT_TAG }},pypa/bandersnatch:s3-3,pypa/bandersnatch:s3-3.13

- name: S3 Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 6.7.0 (Unreleased)

## New Features

- Declare support for python 3.13 `PR #1848`

# 6.6.0

## New Features
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG PY_VERSION=3.12
ARG PY_VERSION=3.13

FROM python:${PY_VERSION} as base
FROM python:${PY_VERSION} AS base

FROM base as builder
FROM base AS builder
ARG PY_VERSION
ARG WITH_S3

Expand All @@ -24,8 +24,8 @@ RUN if [ ! -z "$WITH_S3" ] \


FROM python:${PY_VERSION}-slim
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8

ARG PY_VERSION
ARG WITH_S3
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ author = Christian Theune
author_email = [email protected]
classifiers =
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Programming Language :: Python :: 3.13
description = Mirroring tool that implements the client (mirror) side of PEP 381
long_description = file:README.md
long_description_content_type = text/markdown
Expand All @@ -16,7 +16,7 @@ project_urls =
Source Code = https://github.com/pypa/bandersnatch
Change Log = https://github.com/pypa/bandersnatch/blob/master/CHANGES.md
url = https://github.com/pypa/bandersnatch/
version = 6.6.0
version = 6.7.0.dev0

[options]
install_requires =
Expand Down
4 changes: 2 additions & 2 deletions src/bandersnatch/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ def version_str(self) -> str:

__version_info__ = _VersionInfo(
major=6,
minor=6,
minor=7,
micro=0,
releaselevel="",
releaselevel="dev0",
serial=0, # Not currently in use with Bandersnatch versioning
)
__version__ = __version_info__.version_str
1 change: 1 addition & 0 deletions src/bandersnatch_filter_plugins/filename_name.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class ExcludePlatformFilter(FilterReleaseFilePlugin):
"py3.10",
"py3.11",
"py3.12",
"py3.13",
]

_windowsPlatformTypes = [".win32", "-win32", "win_amd64", "win-amd64"]
Expand Down
Loading