From 9fc246b7d02632c0024573199c0c3446e9269eb8 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Sun, 11 Jul 2021 23:11:10 +0200 Subject: [PATCH] fix imports and requirements for Python 3.7 --- app/scodoc/requirements-3.7.txt | 47 +++++++++++++++++++++++++++++++++ app/scodoc/sco_debouche.py | 2 +- app/scodoc/sco_news.py | 3 ++- 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 app/scodoc/requirements-3.7.txt diff --git a/app/scodoc/requirements-3.7.txt b/app/scodoc/requirements-3.7.txt new file mode 100644 index 000000000..6be0fa12f --- /dev/null +++ b/app/scodoc/requirements-3.7.txt @@ -0,0 +1,47 @@ +alembic==1.6.5 +Babel==2.9.1 +blinker==1.4 +certifi==2021.5.30 +chardet==4.0.0 +click==8.0.1 +cracklib==2.9.3 +dnspython==2.1.0 +dominate==2.6.0 +email-validator==1.1.3 +Flask==2.0.1 +Flask-Babel==2.0.0 +Flask-Bootstrap==3.3.7.1 +Flask-Login==0.5.0 +Flask-Mail==0.9.1 +Flask-Migrate==3.0.1 +Flask-Moment==1.0.1 +Flask-SQLAlchemy==2.5.1 +Flask-WTF==0.15.1 +greenlet==1.1.0 +html2text==2020.1.16 +icalendar==4.0.7 +idna==2.10 +importlib-metadata==4.6.1 +itsdangerous==2.0.1 +Jinja2==3.0.1 +Mako==1.1.4 +MarkupSafe==2.0.1 +Pillow==8.3.1 +pkg-resources==0.0.0 +psycopg2==2.9.1 +PyJWT==2.1.0 +PyRSS2Gen==1.1 +python-dateutil==2.8.1 +python-dotenv==0.18.0 +python-editor==1.0.4 +pytz==2021.1 +reportlab==3.5.68 +requests==2.25.1 +six==1.16.0 +SQLAlchemy==1.4.20 +typing-extensions==3.10.0.0 +urllib3==1.26.6 +visitor==0.1.3 +Werkzeug==2.0.1 +WTForms==2.3.3 +zipp==3.5.0 diff --git a/app/scodoc/sco_debouche.py b/app/scodoc/sco_debouche.py index 3e64f653c..c5f0c0b7a 100644 --- a/app/scodoc/sco_debouche.py +++ b/app/scodoc/sco_debouche.py @@ -28,7 +28,6 @@ """ Rapport (table) avec dernier semestre fréquenté et débouché de chaque étudiant """ -import safehtml from flask import url_for, g @@ -39,6 +38,7 @@ from app.scodoc import VERSION from app.scodoc.sco_exceptions import AccessDenied from app.scodoc.scolog import logdb from app.scodoc.gen_tables import GenTable +from app.scodoc import safehtml from app.scodoc import html_sco_header from app.scodoc import sco_core from app.scodoc import sco_permissions_check diff --git a/app/scodoc/sco_news.py b/app/scodoc/sco_news.py index fc97219a0..0c7fe74d9 100644 --- a/app/scodoc/sco_news.py +++ b/app/scodoc/sco_news.py @@ -39,18 +39,19 @@ from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText from email.header import Header from operator import itemgetter +import six import PyRSS2Gen # pylint: disable=import-error import app.scodoc.sco_utils as scu import app.scodoc.notesdb as ndb from app.scodoc.notes_log import log +from app.scodoc import safehtml from app.scodoc import sco_emails from app.scodoc.sco_utils import SCO_ENCODING, SCO_ANNONCES_WEBSITE from app.scodoc import sco_formsemestre from app.scodoc import sco_moduleimpl from app.scodoc import sco_preferences from app.scodoc import sco_users -import six _scolar_news_editor = ndb.EditableTable( "scolar_news",