Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2.1
jobs:
test:
docker:
- image: cimg/python:3.12.8
- image: cimg/python:3.13.7
steps:
- checkout
- run:
Expand All @@ -25,7 +25,7 @@ jobs:
command: make openapi-generate
build:
docker:
- image: cimg/python:3.12.8
- image: cimg/python:3.13.7
steps:
- checkout
- run:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co)
- [Join Us On Slack!](#join-us-on-slack)
- [Contributing](#contributing)

## Setup <a id="setup"></a> &nbsp; [![pyVersion312](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3128/)
## Setup <a id="setup"></a> &nbsp; [![pyVersion313](https://img.shields.io/badge/python-3.13-blue.svg)](https://www.python.org/downloads/release/python-3137/)

- Download this source code into a working directory, be sure to use the flag `--recurse-submodules` to clone also our submodules.

Expand Down
6 changes: 3 additions & 3 deletions Resources/docker/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.8-alpine3.21 AS builder
FROM python:3.13.7-alpine AS builder

ENV PYTHONUNBUFFERED=1

Expand All @@ -11,15 +11,15 @@ RUN apk add --no-cache --virtual .build-deps gcc g++ musl-dev \
postgresql-dev binutils rust cargo && \
python3 -m pip install -r requirements.txt --no-cache-dir

FROM python:3.12.8-alpine3.21
FROM python:3.13.7-alpine

ENV PYTHONUNBUFFERED=1
ENV DJANGO_SETTINGS_MODULE='config.docker-compose'

RUN mkdir /code
WORKDIR /code

COPY --from=builder /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages
COPY --from=builder /usr/local/lib/python3.13/site-packages /usr/local/lib/python3.13/site-packages
COPY --from=builder /usr/local/bin /usr/local/bin

ADD . /code/
Expand Down
2 changes: 1 addition & 1 deletion Resources/docker/app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
- [`master`](https://github.com/PokeAPI/pokeapi/blob/master/Resources/docker/app/Dockerfile)
- [`staging`](https://github.com/PokeAPI/pokeapi/blob/staging/Resources/docker/app/Dockerfile)

> `pokeapi` uses `python:3.12.8-alpine3.21` as base image.
> `pokeapi` uses `python:3.13.7-alpine` as base image.

## What is PokeAPI?

Expand Down
6 changes: 3 additions & 3 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ pkgs.mkShell {
name = "onix-shellder";
venvDir = "./.venv";
buildInputs = [
python312Packages.python
python312Packages.venvShellHook
python313Packages.python
python313Packages.venvShellHook

# Required dependencies

# Python
python312Packages.black
python313Packages.black

# misc
taglib
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ psycopg2-binary==2.9.10
python-dateutil==2.8.2
python-mimeparse==1.6.0
drf-spectacular==0.28.0
legacy-cgi; python_version >= '3.13'
Comment thread
jonbarrow marked this conversation as resolved.
Outdated