Merge branch 'relax_requirements' into 'beta'

Relax requirements and ignore shell.nix See merge request bde/nk20!187
Ignore shell.nix in Git tree
2025-02-24 17:11:18 +00:00 · 2021-10-05 15:45:31 +02:00 · 2021-10-05 15:14:56 +02:00 · 2021-10-05 15:10:20 +02:00 · 2021-10-05 11:46:24 +02:00
3 changed files with 7 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@ -47,6 +47,7 @@ backups/
 env/
 venv/
 db.sqlite3
+shell.nix

 # ansibles customs host
 ansible/host_vars/*.yaml
--- a/apps/member/tables.py
+++ b/apps/member/tables.py
@ -32,7 +32,7 @@ class ClubTable(tables.Table):
            'class': 'table-row',
            'id': lambda record: "row-" + str(record.pk),
            'data-href': lambda record: record.pk,
-            'style':'cursor:pointer',
+            'style': 'cursor:pointer',
        }


@ -76,7 +76,7 @@ class UserTable(tables.Table):
        row_attrs = {
            'class': 'table-row',
            'data-href': lambda record: record.pk,
-            'style':'cursor:pointer',
+            'style': 'cursor:pointer',
        }


--- 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
Author	SHA1	Message	Date
erdnaxe	0bd447b608	Merge branch 'relax_requirements' into 'beta' Relax requirements and ignore shell.nix See merge request bde/nk20!187	2021-10-05 15:45:31 +02:00
Alexandre Iooss	3f3c93d928	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.	2021-10-05 15:14:56 +02:00
Alexandre Iooss	340c90f5d3	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.	2021-10-05 15:10:20 +02:00
Yohann D'ANELLO	a05dfcbf3d	Linting Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-10-05 11:46:24 +02:00