corrige conflitos

requirements/base.txt

@@ -0,0 +1,18 @@
+python-slugify==8.0.4  # https://github.com/un33k/python-slugify
+Pillow==11.1.0  # https://github.com/python-pillow/Pillow
+rcssmin==1.1.2  # https://github.com/ndparker/rcssmin
+argon2-cffi==23.1.0  # https://github.com/hynek/argon2_cffi
+whitenoise==6.9.0  # https://github.com/evansd/whitenoise
+redis==5.2.1  # https://github.com/redis/redis-py
+hiredis==3.1.0  # https://github.com/redis/hiredis-py
+
+# Django
+# ------------------------------------------------------------------------------
+django==5.0.12  # pyup: < 5.1  # https://www.djangoproject.com/
+django-environ==0.12.0  # https://github.com/joke2k/django-environ
+django-model-utils==5.0.0  # https://github.com/jazzband/django-model-utils
+django-allauth[mfa]==65.4.1  # https://github.com/pennersr/django-allauth
+django-crispy-forms==2.3  # https://github.com/django-crispy-forms/django-crispy-forms
+crispy-bootstrap5==2024.10  # https://github.com/django-crispy-forms/crispy-bootstrap5
+django-compressor==4.5.1  # https://github.com/django-compressor/django-compressor
+django-redis==5.4.0  # https://github.com/jazzband/django-redis

requirements/local.txt

@@ -0,0 +1,33 @@
+-r production.txt
+
+Werkzeug[watchdog]==3.1.3 # https://github.com/pallets/werkzeug
+ipdb==0.13.13  # https://github.com/gotcha/ipdb
+psycopg[c]==3.2.5  # https://github.com/psycopg/psycopg
+
+# Testing
+# ------------------------------------------------------------------------------
+mypy==1.15.0  # https://github.com/python/mypy
+django-stubs[compatible-mypy]==5.1.3  # https://github.com/typeddjango/django-stubs
+pytest==8.3.5  # https://github.com/pytest-dev/pytest
+pytest-sugar==1.0.0  # https://github.com/Frozenball/pytest-sugar
+
+# Documentation
+# ------------------------------------------------------------------------------
+sphinx==8.3.0  # https://github.com/sphinx-doc/sphinx
+sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild
+
+# Code quality
+# ------------------------------------------------------------------------------
+ruff==0.9.9  # https://github.com/astral-sh/ruff
+coverage==7.6.12  # https://github.com/nedbat/coveragepy
+djlint==1.36.4  # https://github.com/Riverside-Healthcare/djLint
+pre-commit==4.1.0  # https://github.com/pre-commit/pre-commit
+
+# Django
+# ------------------------------------------------------------------------------
+factory-boy==3.3.2  # https://github.com/FactoryBoy/factory_boy
+
+django-debug-toolbar==5.0.1  # 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.10.0  # https://github.com/pytest-dev/pytest-django

requirements/production.txt

@@ -0,0 +1,10 @@
+# PRECAUTION: avoid production dependencies that aren't in development
+
+-r base.txt
+
+gunicorn==23.0.0  # https://github.com/benoitc/gunicorn
+psycopg[c]==3.2.5  # https://github.com/psycopg/psycopg
+
+# Django
+# ------------------------------------------------------------------------------
+django-anymail==12.0  # https://github.com/anymail/django-anymail