From 481cb5e47809c61ca55719828c34432bb7a419be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Fri, 22 Nov 2019 21:58:56 +0800 Subject: [PATCH] Move production deps out of requirements.txt --- gestioncof/autocomplete.py | 8 +++++++- kfet/autocomplete.py | 8 +++++++- requirements-prod.txt | 14 ++++++++++++++ requirements.txt | 5 ----- 4 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 requirements-prod.txt diff --git a/gestioncof/autocomplete.py b/gestioncof/autocomplete.py index 0aa94ae9..e27cdb92 100644 --- a/gestioncof/autocomplete.py +++ b/gestioncof/autocomplete.py @@ -3,11 +3,17 @@ from django.conf import settings from django.contrib.auth.models import User from django.db.models import Q from django.http import Http404 -from ldap3 import Connection from gestioncof.decorators import buro_required from gestioncof.models import CofProfile +if getattr(settings, "LDAP_SERVER_URL", None): + from ldap3 import Connection +else: + # shared.tests.testcases.TestCaseMixin.mockLDAP needs + # Connection to be defined in order to mock it. + Connection = None + class Clipper(object): def __init__(self, clipper, fullname): diff --git a/kfet/autocomplete.py b/kfet/autocomplete.py index d7448194..5b23bb1e 100644 --- a/kfet/autocomplete.py +++ b/kfet/autocomplete.py @@ -2,12 +2,18 @@ from django.conf import settings from django.db.models import Q from django.http import Http404 from django.shortcuts import render -from ldap3 import Connection from gestioncof.models import User from kfet.decorators import teamkfet_required from kfet.models import Account +if getattr(settings, "LDAP_SERVER_URL", None): + from ldap3 import Connection +else: + # shared.tests.testcases.TestCaseMixin.mockLDAP needs + # Connection to be defined in order to mock it. + Connection = None + class Clipper(object): def __init__(self, clipper, fullname): diff --git a/requirements-prod.txt b/requirements-prod.txt new file mode 100644 index 00000000..6d7b645e --- /dev/null +++ b/requirements-prod.txt @@ -0,0 +1,14 @@ +-r requirements.txt + +# Postgresql bindings +psycopg2<2.8 + +# Redis +django-redis-cache==1.8.1 + +# ASGI protocol and HTTP server +asgiref==1.1.1 +daphne==1.3.0 + +# ldap bindings +ldap3 diff --git a/requirements.txt b/requirements.txt index 00183aea..7dc49821 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,18 +4,13 @@ django-autocomplete-light==3.3.* django-cas-ng==3.6.* django-djconfig==0.8.0 django-recaptcha==1.4.0 -django-redis-cache==1.8.1 icalendar -psycopg2<2.8 Pillow django-bootstrap-form==3.3 -asgiref==1.1.1 -daphne==1.3.0 asgi-redis==1.3.0 statistics==1.0.3.5 django-widget-tweaks==1.4.1 git+https://git.eleves.ens.fr/cof-geek/django_custommail.git#egg=django_custommail -ldap3 channels==1.1.5 python-dateutil wagtail==2.4.*