Skip to content

Commit

Permalink
Merge branch 'peterbe:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
EmberCraze authored Dec 18, 2024
2 parents 9da859c + 4e834dd commit 68abb12
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 5 deletions.
14 changes: 11 additions & 3 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,28 @@

name: Python

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:

# Drop permissions to minimum for security
permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9, "3.10", "3.11"]
python-version: [3.9, "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
0.1.11
~~~~~~

- Include 3.12 in tests and omit 3.8
`pull#69 <https://github.com/peterbe/django-cache-memoize/pull/69>`

0.1.10
~~~~~~

- Support for Django 3.2
`pull#51 <https://github.com/peterbe/django-cache-memoize/pull/51>`
Thanks @UsamaSadiq

0.1.9
~~~~~

- Fix potential problem with default cache key generation (sort order,
possible identical key, quoting of paramters with ``=`` sign in string)
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ envlist =
lint-py311,
readme-py311,
docs-py311,
py38-django{32,41,42},
py39-django{32,41,42},
py310-django{32,41,42},
py311-django{41,42},
py312-django{41,42},

[gh-actions]
python =
3.8: py38
3.9: py39
3.10: py310
3.11: py311, lint, restlint
3.12: py312

[testenv]
usedevelop = true
Expand Down

0 comments on commit 68abb12

Please sign in to comment.