Skip to content

Commit

Permalink
Updated to Python 3.12
Browse files Browse the repository at this point in the history
  • Loading branch information
Tecktron committed May 28, 2024
1 parent e80b4ba commit 069b583
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 14 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
FROM tecktron/python-bjoern:latest
FROM tecktron/python-bjoern:python-3.12
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get clean && apt-get update && \
apt-get -y install --no-install-recommends \
apt-utils \
build-essential \
libpq-dev \
postgresql-client \
&& rm -rf /var/lib/apt/lists/*

ENV MODULE_NAME=webhook_catcher.wsgi
Expand Down
18 changes: 18 additions & 0 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM tecktron/python-bjoern:latest
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get clean && apt-get update && \
apt-get -y install --no-install-recommends \
apt-utils \
build-essential \
libpq-dev \
postgresql-client \
&& rm -rf /var/lib/apt/lists/*

ENV MODULE_NAME=webhook_catcher.wsgi

COPY . /app
RUN chmod +x /app/prestart.sh
WORKDIR /app/

RUN python -m pip install pip --no-cache-dir --upgrade
RUN pip install -r /app/dev.requirements.txt
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Includes a Django admin page what shows the url that was hit, and the data that

## Requirements
- A Postgres Database.
- Python 3.8+ or Docker
- Python 3.8+ or Docker (pinned at 3.12)

## Installation

Expand Down Expand Up @@ -108,5 +108,4 @@ Before submitting any code please be sure you have done the following:
### Testing
Every bit of code you submit must be fully tested.
All testing is done using pytest, please follow pytest style testing (not unittest).
You can simply use tox to run the tests: `tox -e py39`. This supports environments
`py36` - `py39`.
You can simply use tox to run the tests: `tox -e py312`.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.2
1.1.0
4 changes: 3 additions & 1 deletion dev.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ services:
- POSTGRES_PASSWORD=postgres

webhook_catcher:
build: .
build:
context: .
dockerfile: Dockerfile.dev
volumes:
- .:/app
environment:
Expand Down
2 changes: 0 additions & 2 deletions dev.requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
-r ./requirements.txt
pip
tox
tox-pip-extensions
isort
flake8
factory-boy
Expand All @@ -13,4 +12,3 @@ pytest-xdist
freezegun
black
django-coverage-plugin

2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
psycopg2-binary
Django==3.1
django<5
django-postgres-unlimited-varchar
django-prettyjson
python-dotenv
Expand Down
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[tox]
envlist = py38,py39,py37,py36
isolated_build = True
tox_pip_extensions_ext_venv_update = true
envlist = py38,py39,py310,py311,py312
skip_missing_interpreters = True
skipsdist = True

[testenv]
Expand Down
1 change: 0 additions & 1 deletion webhook_catcher/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@
LANGUAGE_CODE = "en-us"
TIME_ZONE = "UTC"
USE_I18N = True
USE_L10N = True
USE_TZ = True


Expand Down

0 comments on commit 069b583

Please sign in to comment.