Skip to content

Commit

Permalink
Merge pull request #32 from ambitioninc/develop
Browse files Browse the repository at this point in the history
merge master
  • Loading branch information
benthuffine authored Aug 28, 2023
2 parents 8eaf85e + 2a6ecd2 commit 327713a
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 1 deletion.
10 changes: 10 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,22 @@ jobs:
- 'Django~=4.0.0'
- 'Django~=4.1.0'
- 'Django~=4.2.0'
psycopg:
- 'psycopg2==2.9.6'
- 'psycopg==3.1.10'
exclude:
- python: '3.7'
django: 'Django~=4.0.0'
- python: '3.7'
django: 'Django~=4.1.0'
- python: '3.7'
django: 'Django~=4.2.0'
- psycopg: 'psycopg==3.1.10'
django: 'Django~=3.2.0'
- psycopg: 'psycopg==3.1.10'
django: 'Django~=4.0.0'
- psycopg: 'psycopg==3.1.10'
django: 'Django~=4.1.0'
services:
postgres:
image: postgres:14.5
Expand Down Expand Up @@ -56,6 +65,7 @@ jobs:
pip install -r requirements/requirements.txt
pip install -r requirements/requirements-testing.txt
pip install "${{ matrix.django }}"
pip install "${{ matrix.psycopg }}"
pip freeze
- name: Run tests
env:
Expand Down
14 changes: 14 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
version: 2

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

sphinx:
configuration: docs/conf.py

python:
install:
- requirements: requirements/docs.txt
- requirements: requirements/requirements.txt
2 changes: 1 addition & 1 deletion django_kmatch/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '2.0.3'
__version__ = '2.0.4'
5 changes: 5 additions & 0 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Release Notes
=============

v2.0.4
------
* Read the Docs config file v2
* Github actions for testing psycopg3

v2.0.3
------
* Python 3.8,3.9
Expand Down

0 comments on commit 327713a

Please sign in to comment.