From 9161d55c595baf85c61a506ffe18b16858b34488 Mon Sep 17 00:00:00 2001 From: Etienne Pallier Date: Wed, 27 Nov 2019 16:23:18 +0100 Subject: [PATCH] renommage fichier requirements.txt (en minuscule c'est le standard) --- install/REQUIREMENTS.txt | 41 ----------------------------------------- install/REQUIREMENTS_ORIG.txt | 41 +++++++++++++++++++++++++++++++++++++++++ install/install.py | 6 ++++-- 3 files changed, 45 insertions(+), 43 deletions(-) delete mode 100644 install/REQUIREMENTS.txt create mode 100644 install/REQUIREMENTS_ORIG.txt diff --git a/install/REQUIREMENTS.txt b/install/REQUIREMENTS.txt deleted file mode 100644 index afd506d..0000000 --- a/install/REQUIREMENTS.txt +++ /dev/null @@ -1,41 +0,0 @@ -anyjson==0.3.3 -click -DateTime==4.2 -Django==2.0.5 -django-admin-tools==0.8.1 -django-bootstrap3==10.0.1 -django-extensions==2.0.7 - -# for Choices -django-model-utils - -django-suit==0.2.26 -django-test-without-migrations==0.6 -#gunicorn==19.8.1 -iso8601==0.1.12 -jdcal==1.4 -lxml==4.3.0 -mysqlclient==1.3.12 -#pluggy>=0.7 -pluggy==0.8.1 -py==1.5.3 -pytz==2018.4 -requests==2.18.4 -six==1.11.0 -sqlparse==0.2.4 -Twisted==18.4.0 -voevent-parse==1.0.3 -zope.interface==4.5.0 - -# For DEV -django-debug-toolbar==1.9.1 -plantuml - -# For Celery: -##celery==3.1.23 -##flower==0.9.2 -##amqp==1.4.9 -##amqplib==1.0.2 -##billiard==3.3.0.23 -##kombu==3.0.37 -##django-celery==3.1.17 diff --git a/install/REQUIREMENTS_ORIG.txt b/install/REQUIREMENTS_ORIG.txt new file mode 100644 index 0000000..afd506d --- /dev/null +++ b/install/REQUIREMENTS_ORIG.txt @@ -0,0 +1,41 @@ +anyjson==0.3.3 +click +DateTime==4.2 +Django==2.0.5 +django-admin-tools==0.8.1 +django-bootstrap3==10.0.1 +django-extensions==2.0.7 + +# for Choices +django-model-utils + +django-suit==0.2.26 +django-test-without-migrations==0.6 +#gunicorn==19.8.1 +iso8601==0.1.12 +jdcal==1.4 +lxml==4.3.0 +mysqlclient==1.3.12 +#pluggy>=0.7 +pluggy==0.8.1 +py==1.5.3 +pytz==2018.4 +requests==2.18.4 +six==1.11.0 +sqlparse==0.2.4 +Twisted==18.4.0 +voevent-parse==1.0.3 +zope.interface==4.5.0 + +# For DEV +django-debug-toolbar==1.9.1 +plantuml + +# For Celery: +##celery==3.1.23 +##flower==0.9.2 +##amqp==1.4.9 +##amqplib==1.0.2 +##billiard==3.3.0.23 +##kombu==3.0.37 +##django-celery==3.1.17 diff --git a/install/install.py b/install/install.py index 0d6329d..bba0442 100755 --- a/install/install.py +++ b/install/install.py @@ -22,7 +22,8 @@ SQL_USER = "pyros" SQL_PSWD = "DjangoPyros" MYSQL_EXE_PATH = "" -REQUIREMENTS = 'REQUIREMENTS.txt' +REQUIREMENTS = 'requirements.txt' +##REQUIREMENTS = 'REQUIREMENTS.txt' #REQUIREMENTS = 'REQUIREMENTS_36.txt' #REQUIREMENTS = 'REQUIREMENTS_37.txt' END_OF_LINE = '\n\n' @@ -33,7 +34,8 @@ WINDOWS = False # -------------------------------------------- if (platform.system() == "Windows"): WINDOWS = True - REQUIREMENTS = 'REQUIREMENTS_WINDOWS.txt' + REQUIREMENTS = 'requirements_win.txt' + ##REQUIREMENTS = 'REQUIREMENTS_WINDOWS.txt' #REQUIREMENTS = 'REQUIREMENTS_WINDOWS_36.txt' END_OF_LINE = "\r\n\r\n" VENV_BIN = '\\Scripts\\' -- libgit2 0.21.2