Skip to content

Commit

Permalink
build(better-requirements): use uv pip compile and update several dep…
Browse files Browse the repository at this point in the history
…endencies; remove black/isort from pre-commit

update pre-commit hooks
  • Loading branch information
WoosterInitiative committed Mar 19, 2024
1 parent c7875d4 commit 9827fdc
Show file tree
Hide file tree
Showing 8 changed files with 452 additions and 20 deletions.
36 changes: 18 additions & 18 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,44 +31,44 @@ repos:
exclude: wooster_django/templates/
id: prettier
repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.1.0
rev: v4.0.0-alpha.8
- hooks:
- args:
- --target-version
- '4.2'
- '5.0'
id: django-upgrade
repo: https://github.com/adamchainz/django-upgrade
rev: 1.15.0
rev: 1.16.0
- hooks:
- args:
- --py311-plus
id: pyupgrade
repo: https://github.com/asottile/pyupgrade
rev: v3.15.0
rev: v3.15.1
- hooks:
- args:
- --fix
- --exit-non-zero-on-fix
id: ruff
repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.6
- hooks:
- id: black
repo: https://github.com/psf/black
rev: 23.11.0
- hooks:
- id: isort
repo: https://github.com/PyCQA/isort
rev: 5.12.0
rev: v0.3.3
# - hooks:
# - id: black
# repo: https://github.com/psf/black
# rev: 23.11.0
# - hooks:
# - id: isort
# repo: https://github.com/PyCQA/isort
# rev: 5.12.0
- hooks:
- id: djlint-reformat-django
- id: djlint-django
repo: https://github.com/Riverside-Healthcare/djLint
rev: v1.34.0
rev: v1.34.1
- hooks:
- id: commitizen
- id: commitizen-branch
stages:
- push
# - id: commitizen-branch
# stages:
# - push
repo: https://github.com/commitizen-tools/commitizen
rev: v3.14.1
rev: v3.18.4
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,8 @@
},
"emmet.includeLanguages": {
"django-html": "html"
},
"files.associations": {
"*.in": "pip-requirements"
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
Anything and everything I want to track

[![Built with Cookiecutter Django](https://img.shields.io/badge/built%20with-Cookiecutter%20Django-ff69b4.svg?logo=cookiecutter)](https://github.com/cookiecutter/cookiecutter-django/)
[![Black code style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
[![Code style: djlint](https://img.shields.io/badge/html%20style-djlint-blue.svg)](https://www.djlint.com)

License: MIT

Expand Down
1 change: 0 additions & 1 deletion requirements-freeze.txt

This file was deleted.

27 changes: 27 additions & 0 deletions requirements/in/base.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
python-slugify==8.0.4 # https://github.com/un33k/python-slugify
Pillow==10.2.0 # https://github.com/python-pillow/Pillow
# rcssmin==1.1.0 --install-option="--without-c-extensions" #
# https://github.com/ndparker/rcssmin
# rcssmin==1.1.2 # https://github.com/ndparker/rcssmin
argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi
shortuuid==1.0.13 # https://github.com/skorokithakis/shortuuid/
whitenoise==6.6.0 # https://github.com/evansd/whitenoise
redis==5.0.3 # https://github.com/redis/redis-py
celery==5.3.6
# receiptparser @ ../../receiptparser
furl==2.1.3

# Django
# ------------------------------------------------------------------------------
django==5.0.3 # https://www.djangoproject.com/
django-colorfield==0.11.0 # https://github.com/fabiocaccamo/django-colorfield
django-environ==0.11.2 # https://github.com/joke2k/django-environ
django-model-utils==4.4.0 # https://github.com/jazzband/django-model-utils
django-allauth==0.61.1 # https://github.com/pennersr/django-allauth
django-crispy-forms==2.1 # https://github.com/django-crispy-forms/django-crispy-forms
crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5
django-phonenumber-field[phonenumberslite]==7.3.0 # https://github.com/stefanfoulis/django-phonenumber-field
django-compressor @ git+https://github.com/django-compressor/django-compressor.git # https://github.com/django-compressor/django-compressor
django-redis==5.4.0 # https://github.com/jazzband/django-redis
dj-database-url==2.1.0 # https://github.com/jazzband/dj-database-url/
django-constance[redis]==3.1.0 # https://github.com/jazzband/django-constance
39 changes: 39 additions & 0 deletions requirements/in/local.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
-r base.in

Werkzeug[watchdog]==3.0.1 # https://github.com/pallets/werkzeug
ipdb==0.13.13 # https://github.com/gotcha/ipdb
psycopg[binary]==3.1.18 # https://github.com/psycopg/psycopg
commitizen~=3.18.3

# Testing
# ------------------------------------------------------------------------------
mypy<1.8.0 # https://github.com/python/mypy
django-stubs[compatible-mypy]~=4.2.6 # https://github.com/typeddjango/django-stubs
pytest~=8.1.1 # https://github.com/pytest-dev/pytest
pytest-sugar~=1.0.0 # https://github.com/Frozenball/pytest-sugar
types-python-slugify~=8.0.2.20240127

# Documentation
# ------------------------------------------------------------------------------
sphinx==7.2.6 # https://github.com/sphinx-doc/sphinx
sphinx-autobuild==2024.2.4 # https://github.com/GaretJax/sphinx-autobuild

# Code quality
# ------------------------------------------------------------------------------
# flake8==6.1.0 # https://github.com/PyCQA/flake8
# flake8-isort==6.1.1 # https://github.com/gforcada/flake8-isort
ruff~=0.3.3
coverage~=7.4.4 # https://github.com/nedbat/coveragepy
# black==23.11.0 # https://github.com/psf/black
djlint~=1.34.1 # https://github.com/Riverside-Healthcare/djLint
pylint-django~=2.5.5 # https://github.com/PyCQA/pylint-django
pre-commit~=3.6.2 # https://github.com/pre-commit/pre-commit

# Django
# ------------------------------------------------------------------------------
factory-boy==3.3.0 # https://github.com/FactoryBoy/factory_boy

django-debug-toolbar~=4.3.0 # https://github.com/jazzband/django-debug-toolbar
django-extensions~=3.2.3 # https://github.com/django-extensions/django-extensions
django-coverage-plugin~=3.1.0 # https://github.com/nedbat/django_coverage_plugin
pytest-django~=4.8.0 # https://github.com/pytest-dev/pytest-django
11 changes: 11 additions & 0 deletions requirements/in/production.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# PRECAUTION: avoid production dependencies that aren't in development

-r base.in

gunicorn~=21.2.0 # https://github.com/benoitc/gunicorn
psycopg[c]~=3.1.13 # https://github.com/psycopg/psycopg
hiredis~=2.2.3 # https://github.com/redis/hiredis-py

# Django
# ------------------------------------------------------------------------------
django-anymail[sendgrid]==10.2 # https://github.com/anymail/django-anymail
Loading

0 comments on commit 9827fdc

Please sign in to comment.