From b4a703dfd833ced58054900554e62c5167836ee5 Mon Sep 17 00:00:00 2001 From: areski Date: Mon, 28 Sep 2015 16:42:02 +0200 Subject: [PATCH] rename requirements files --- .travis.yml | 2 +- README.rst | 2 +- install/install-all.sh | 2 +- install/install-freeswitch.sh | 2 +- install/install-newfies.sh | 2 +- install/newfies-dialer-functions.sh | 8 ++++---- .../all-requirements.txt => requirements/all.txt | 0 .../basic-requirements.txt => requirements/basic.txt | 0 .../dev-requirements.txt => requirements/dev.txt | 0 .../django-requirements.txt => requirements/django.txt | 0 .../install-requirements.sh => requirements/install.sh | 0 .../rtd-requirements.txt => requirements/rtd.txt | 0 .../test-requirements.txt => requirements/test.txt | 0 setup.py | 4 ++-- 14 files changed, 11 insertions(+), 11 deletions(-) rename install/requirements/all-requirements.txt => requirements/all.txt (100%) rename install/requirements/basic-requirements.txt => requirements/basic.txt (100%) rename install/requirements/dev-requirements.txt => requirements/dev.txt (100%) rename install/requirements/django-requirements.txt => requirements/django.txt (100%) rename install/requirements/install-requirements.sh => requirements/install.sh (100%) rename install/requirements/rtd-requirements.txt => requirements/rtd.txt (100%) rename install/requirements/test-requirements.txt => requirements/test.txt (100%) diff --git a/.travis.yml b/.travis.yml index d5a88f1e5..c898b02d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ services: install: # - pip install -q Django==$DJANGO --use-mirrors - sudo apt-get install flite - - bash install/requirements/install-requirements.sh + - bash install/requirements/install.sh # - pip install pep8 --use-mirrors # - pip install https://github.com/dcramer/pyflakes/tarball/master before_script: diff --git a/README.rst b/README.rst index 699e72ed0..9d4307573 100644 --- a/README.rst +++ b/README.rst @@ -74,7 +74,7 @@ Newfies is a django based application, so the major requirements are : All the requirements can easily be installed with PIP (http://pypi.python.org/pypi/pip) : - - https://github.com/newfies-dialer/newfies-dialer/blob/master/install/requirements/all-requirements.txt + - https://github.com/newfies-dialer/newfies-dialer/blob/master/requirements/all.txt Installation Script diff --git a/install/install-all.sh b/install/install-all.sh index aec8fa23d..3f42be1d0 100755 --- a/install/install-all.sh +++ b/install/install-all.sh @@ -24,7 +24,7 @@ #TODO: Move BRANCH to Environement variable #Set branch to install develop / master -BRANCH='master' +BRANCH="develop" SCRIPT_NOTICE="This script is only intended to run on Debian 64bits 7.X or 8.X" diff --git a/install/install-freeswitch.sh b/install/install-freeswitch.sh index b6c450668..ca7be1fad 100755 --- a/install/install-freeswitch.sh +++ b/install/install-freeswitch.sh @@ -19,7 +19,7 @@ # #Set branch to install develop / master -BRANCH='master' +BRANCH="develop" FS_CONF_PATH=https://raw.github.com/newfies-dialer/newfies-dialer/$BRANCH/install/freeswitch-conf FS_INIT_PATH=https://raw.github.com/newfies-dialer/newfies-dialer/$BRANCH/install/freeswitch-init diff --git a/install/install-newfies.sh b/install/install-newfies.sh index a35ec1863..9ec75c2dc 100755 --- a/install/install-newfies.sh +++ b/install/install-newfies.sh @@ -24,7 +24,7 @@ # #Set branch to install develop / master -BRANCH='master' +BRANCH="develop" #Get Scripts dependencies cd /usr/src/ diff --git a/install/newfies-dialer-functions.sh b/install/newfies-dialer-functions.sh index 6d6c1b4d3..3bd39ac2b 100644 --- a/install/newfies-dialer-functions.sh +++ b/install/newfies-dialer-functions.sh @@ -24,7 +24,7 @@ # #Set branch to install develop / master -BRANCH="master" +BRANCH="develop" DATETIME=$(date +"%Y%m%d%H%M%S") INSTALL_DIR='/usr/share/newfies' @@ -493,19 +493,19 @@ func_install_pip_deps(){ pip install importlib echo "Install Basic requirements..." - for line in $(cat /usr/src/newfies-dialer/install/requirements/basic-requirements.txt | grep -v \#) + for line in $(cat /usr/src/newfies-dialer/requirements/basic.txt | grep -v \#) do echo "pip install $line" pip install $line done echo "Install Django requirements..." - for line in $(cat /usr/src/newfies-dialer/install/requirements/django-requirements.txt | grep -v \#) + for line in $(cat /usr/src/newfies-dialer/requirements/django.txt | grep -v \#) do echo "pip install $line" pip install $line --allow-all-external --allow-unverified django-admin-tools done echo "Install Test requirements..." - for line in $(cat /usr/src/newfies-dialer/install/requirements/test-requirements.txt | grep -v \#) + for line in $(cat /usr/src/newfies-dialer/requirements/test.txt | grep -v \#) do echo "pip install $line" pip install $line diff --git a/install/requirements/all-requirements.txt b/requirements/all.txt similarity index 100% rename from install/requirements/all-requirements.txt rename to requirements/all.txt diff --git a/install/requirements/basic-requirements.txt b/requirements/basic.txt similarity index 100% rename from install/requirements/basic-requirements.txt rename to requirements/basic.txt diff --git a/install/requirements/dev-requirements.txt b/requirements/dev.txt similarity index 100% rename from install/requirements/dev-requirements.txt rename to requirements/dev.txt diff --git a/install/requirements/django-requirements.txt b/requirements/django.txt similarity index 100% rename from install/requirements/django-requirements.txt rename to requirements/django.txt diff --git a/install/requirements/install-requirements.sh b/requirements/install.sh similarity index 100% rename from install/requirements/install-requirements.sh rename to requirements/install.sh diff --git a/install/requirements/rtd-requirements.txt b/requirements/rtd.txt similarity index 100% rename from install/requirements/rtd-requirements.txt rename to requirements/rtd.txt diff --git a/install/requirements/test-requirements.txt b/requirements/test.txt similarity index 100% rename from install/requirements/test-requirements.txt rename to requirements/test.txt diff --git a/setup.py b/setup.py index 2f7305f3c..73c8255cf 100644 --- a/setup.py +++ b/setup.py @@ -61,8 +61,8 @@ def parse_dependency_links(file_name): package_dir={'newfies': 'newfies'}, packages=find_packages(), package_data={}, - # install_requires=parse_requirements('install/requirements/rtd-requirements.txt'), - # dependency_links=parse_dependency_links('install/requirements/rtd-requirements.txt'), + # install_requires=parse_requirements('requirements/rtd.txt'), + # dependency_links=parse_dependency_links('requirements/rtd.txt'), license='MPL 2.0 License', classifiers=[ 'Development Status :: 5 - Production/Stable',