Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: piccolo-orm/piccolo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.72.0
Choose a base ref
...
head repository: piccolo-orm/piccolo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 347 changed files with 24,898 additions and 4,719 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -11,10 +11,10 @@ jobs:
runs-on: "ubuntu-latest"

steps:
- uses: "actions/checkout@v2"
- uses: "actions/setup-python@v1"
- uses: "actions/checkout@v3"
- uses: "actions/setup-python@v5"
with:
python-version: 3.7
python-version: 3.13
- name: "Install dependencies"
run: "pip install -r requirements/dev-requirements.txt"
- name: "Publish to PyPI"
82 changes: 60 additions & 22 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
@@ -2,22 +2,26 @@ name: Test Suite

on:
push:
branches: ["master"]
branches: ["master", "v1"]
paths-ignore:
- "docs/**"
pull_request:
branches: ["master"]
branches: ["master", "v1"]
paths-ignore:
- "docs/**"

jobs:
linters:
runs-on: ubuntu-latest
timeout-minutes: 30
timeout-minutes: 60
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10"]
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
@@ -31,13 +35,13 @@ jobs:

integration:
runs-on: ubuntu-latest
timeout-minutes: 30
timeout-minutes: 60
strategy:
matrix:
# These tests are slow, so we only run on the latest Python
# version.
python-version: ["3.10"]
postgres-version: [14]
python-version: ["3.13"]
postgres-version: [17]
services:
postgres:
image: postgres:${{ matrix.postgres-version }}
@@ -51,9 +55,9 @@ jobs:
ports:
- 5432:5432
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
@@ -78,11 +82,11 @@ jobs:

postgres:
runs-on: ubuntu-latest
timeout-minutes: 30
timeout-minutes: 60
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10"]
postgres-version: [9.6, 10, 11, 12, 13, 14]
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
postgres-version: [12, 13, 14, 15, 16, 17]

# Service containers to run with `container-job`
services:
@@ -103,9 +107,9 @@ jobs:
- 5432:5432

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
@@ -130,19 +134,53 @@ jobs:
PG_PASSWORD: postgres
- name: Upload coverage
uses: codecov/codecov-action@v1
if: matrix.python-version == '3.7'
if: matrix.python-version == '3.13'

cockroach:
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
cockroachdb-version: ["v24.1.0"]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements/requirements.txt
pip install -r requirements/test-requirements.txt
pip install -r requirements/extras/postgres.txt
- name: Setup CockroachDB
run: |
wget -qO- https://binaries.cockroachdb.com/cockroach-${{ matrix.cockroachdb-version }}.linux-amd64.tgz | tar xz
./cockroach-${{ matrix.cockroachdb-version }}.linux-amd64/cockroach start-single-node --insecure --background
./cockroach-${{ matrix.cockroachdb-version }}.linux-amd64/cockroach sql --insecure -e 'create database piccolo;'
- name: Test with pytest, CockroachDB
run: ./scripts/test-cockroach.sh
env:
PG_HOST: localhost
PG_DATABASE: piccolo
- name: Upload coverage
uses: codecov/codecov-action@v1
if: matrix.python-version == '3.13'

sqlite:
runs-on: ubuntu-latest
timeout-minutes: 30
timeout-minutes: 60
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10"]
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
@@ -155,4 +193,4 @@ jobs:
run: ./scripts/test-sqlite.sh
- name: Upload coverage
uses: codecov/codecov-action@v1
if: matrix.python-version == '3.7'
if: matrix.python-version == '3.13'
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -19,3 +19,8 @@ prof/
.env/
.venv/
result.json

# CockroachDB
cockroach-data/
heap_profiler/
goroutine_dump/
21 changes: 21 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# .readthedocs.yaml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

version: 2

build:
os: ubuntu-22.04
tools:
python: "3.11"

sphinx:
configuration: docs/src/conf.py

formats:
- pdf
- epub

python:
install:
- requirements: requirements/readthedocs-requirements.txt
Loading