From 340c90f5d361a37eb6f42d0330699e428a7a53de Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Tue, 5 Oct 2021 15:10:20 +0200 Subject: [PATCH 1/2] Relax requirements Relax requirements to allow the use of newer versions of dependencies found in NixPkgs and ArchLinux. Do not limit upper version of django-extensions as it is not mission critical. --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0071bc83..f4ece220 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,14 +4,14 @@ django-bootstrap-datepicker-plus~=3.0.5 django-cas-server~=1.2.0 django-colorfield~=0.3.2 django-crispy-forms~=1.7.2 -django-extensions~=2.1.4 -django-filter~=2.1.0 +django-extensions>=2.1.4 +django-filter~=2.1 django-htcpcp-tea~=0.3.1 django-mailer~=2.0.1 django-oauth-toolkit~=1.3.3 django-phonenumber-field~=5.0.0 -django-polymorphic~=2.0.3 -djangorestframework~=3.9.0 +django-polymorphic>=2.0.3,<3.0.0 +djangorestframework>=3.9.0,<3.13.0 django-rest-polymorphic~=0.1.9 django-tables2~=2.3.1 python-memcached~=1.59 From 3f3c93d928c97911b02f0f5a22a0a74c489ade5d Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Tue, 5 Oct 2021 15:14:56 +0200 Subject: [PATCH 2/2] Ignore shell.nix in Git tree shell.nix is used in Nix to create a specific shell with custom packages. The name is standardised and need to be in project folder to ease development tools integrations. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index affc851f..91e55e22 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ backups/ env/ venv/ db.sqlite3 +shell.nix # ansibles customs host ansible/host_vars/*.yaml