Skip to content

Commit

Permalink
Update deps (#13)
Browse files Browse the repository at this point in the history
1. Minimized dependencies
2. Bumped CI software versions
  • Loading branch information
M1ha-Shvn authored Jan 4, 2024
1 parent 2530f63 commit 9e3c369
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 13 deletions.
File renamed without changes.
32 changes: 27 additions & 5 deletions .github/workflows/python-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,35 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
postgres-version: ["9.6.17", "10.12", "11.7", "12.2", "13.2"]
django-version: ["2.1", "2.2", "3.0", "3.1", "3.2"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
postgres-version: ["11", "12", "13", "14", "15"]
django-version: ["2.2", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "5.0"]
exclude:
# Django 4.0+ doesn't support python 3.7
- python-version: "3.7"
django-version: "4.0"
- python-version: "3.7"
django-version: "4.1"
- python-version: "3.7"
django-version: "4.2"
- python-version: "3.7"
django-version: "5.0"

# Django 5.0+ doesn't support python 3.8, 3.9
- python-version: "3.8"
django-version: "5.0"
- python-version: "3.9"
django-version: "5.0"

# Django 4.2+ doesn't support PostgreSQL 11
- django-version: "4.2"
postgres-version: "11"
- django-version: "5.0"
postgres-version: "11"

services:
postgres:
image: jasei/postgres-hll:${{ matrix.postgres-version }}
image: hbontempo/postgres-hll:${{ matrix.postgres-version }}-latest
env:
POSTGRES_PASSWORD: postgres
options: >-
Expand Down Expand Up @@ -49,7 +71,7 @@ jobs:
- name: Install pip dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade pip setuptools
pip install -r requirements-test.txt
pip install -U django==${{ matrix.django-version }}.*
python setup.py -q install
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ Provides a django wrapper for [postgresql-hll library by CitusData](https://gith

## Requirements
* Python 3.5+
* django >= 1.9 (tested 2.1+)
* psycopg2-binary
* django >= 1.9 (tested 2.2+)
* PostgreSQL 9.4+ (tested 9.6+)

## Installation
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
version: "3.9"
services:
postgres_db:
image: jasei/postgres-hll
image: hbontempo/postgres-hll:15-latest
environment:
- POSTGRES_PASSWORD=postgres
volumes:
- ./.docker/db-init.sql:/docker-entrypoint-initdb.d/db-init.sql
- ./.docker/postgres/db-init.sql:/docker-entrypoint-initdb.d/db-init.sql
mem_limit: 1g
cpus: 1

Expand Down
1 change: 0 additions & 1 deletion requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Django (>=1.7)
pytz; python_version < '3.3'
typing; python_version < '3.5'
psycopg2-binary

Expand Down
2 changes: 0 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
Django (>=1.7)
pytz; python_version < '3.3'
typing; python_version < '3.5'
psycopg2-binary
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

setup(
name='django-pg-hll',
version='2.1.0',
version='2.1.1',
packages=['django_pg_hll'],
package_dir={'': 'src'},
url='https://github.com/M1hacka/django-pg-hll',
Expand Down

0 comments on commit 9e3c369

Please sign in to comment.