rename requirements files

ernany · Sep 28, 2015 · b4a703d · b4a703d
1 parent eeadaca
commit b4a703d
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → requirements/all.txt b/install/requirements/all-requirements.txt → requirements/all.txt
diff --git a/install/requirements/basic-requirements.txt → requirements/basic.txt b/install/requirements/basic-requirements.txt → requirements/basic.txt
diff --git a/install/requirements/dev-requirements.txt → requirements/dev.txt b/install/requirements/dev-requirements.txt → requirements/dev.txt
diff --git a/install/requirements/django-requirements.txt → requirements/django.txt b/install/requirements/django-requirements.txt → requirements/django.txt
diff --git a/install/requirements/install-requirements.sh → requirements/install.sh b/install/requirements/install-requirements.sh → requirements/install.sh
diff --git a/install/requirements/rtd-requirements.txt → requirements/rtd.txt b/install/requirements/rtd-requirements.txt → requirements/rtd.txt
diff --git a/install/requirements/test-requirements.txt → requirements/test.txt b/install/requirements/test-requirements.txt → requirements/test.txt
diff --git 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',