From a4553708999b31d3fd4ec73f1fae31ffd712b91a Mon Sep 17 00:00:00 2001 From: emkael Date: Fri, 25 Nov 2016 17:38:18 +0100 Subject: Requirements files split per platform --- README.md | 9 ++++++--- requirements-linux.txt | 3 +++ requirements-windows.txt | 2 ++ requirements.txt | 2 -- 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 requirements-linux.txt create mode 100644 requirements-windows.txt delete mode 100644 requirements.txt diff --git a/README.md b/README.md index 7113301..7f33a4b 100644 --- a/README.md +++ b/README.md @@ -5,14 +5,17 @@ Command-line interface for line-up management in JFR Teamy. Prerequisites: -* Python 3 +* Python 3 (on Windows <= 3.4 due to the availability of MySQL connector) * pip -* the prerequisites of mysqlclient-python - https://github.com/PyMySQL/mysqlclient-python +* Linux environment: the prerequisites of mysqlclient-python - https://github.com/PyMySQL/mysqlclient-python +* Windows environment: MySQL connector from Oracle, unavailable via PIP - https://dev.mysql.com/downloads/connector/python/ ``` -pip install -r requirements.txt +pip install -r requirements-PLATFORM.txt ``` +Where `PLATFORM` is either `windows` or `linux`. + # Configuration Set MySQL settings in ql/settings.py. diff --git a/requirements-linux.txt b/requirements-linux.txt new file mode 100644 index 0000000..02377be --- /dev/null +++ b/requirements-linux.txt @@ -0,0 +1,3 @@ +django +mysqlclient +readline diff --git a/requirements-windows.txt b/requirements-windows.txt new file mode 100644 index 0000000..48b847f --- /dev/null +++ b/requirements-windows.txt @@ -0,0 +1,2 @@ +django +pyreadline diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index b2ef732..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -django==1.10 -mysqlclient==1.3.9 -- cgit v1.2.3 From 33dc53d44816b57d6f90dd656574b725294a1b49 Mon Sep 17 00:00:00 2001 From: emkael Date: Fri, 25 Nov 2016 17:40:55 +0100 Subject: README for MySQL engines updated. Closes: #5 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7f33a4b..6b47751 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,6 @@ Prerequisites: * Python 3 (on Windows <= 3.4 due to the availability of MySQL connector) * pip -* Linux environment: the prerequisites of mysqlclient-python - https://github.com/PyMySQL/mysqlclient-python * Windows environment: MySQL connector from Oracle, unavailable via PIP - https://dev.mysql.com/downloads/connector/python/ ``` @@ -20,6 +19,8 @@ Where `PLATFORM` is either `windows` or `linux`. Set MySQL settings in ql/settings.py. +For Linux, you can leave the default `engine` property, for Windows, you have to change it to `mysql.connector.django` to use Oracle connector. + # Usage ``` -- cgit v1.2.3