Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Only Require PyInotify on Linux
  • Loading branch information
derks committed May 6, 2015
1 parent 4dd61ef commit 2019953
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 6 deletions.
5 changes: 5 additions & 0 deletions requirements-dev-linux.txt
@@ -0,0 +1,5 @@
-r requirements-dev.txt

# additional optional requirements for extensions available only on linux
pyinotify

4 changes: 4 additions & 0 deletions requirements-dev-py3-linux.txt
@@ -0,0 +1,4 @@
-r requirements-dev-py3.txt

# additional optional requirements for extensions available only on linux
pyinotify
1 change: 0 additions & 1 deletion requirements-dev-py3.txt
Expand Up @@ -9,4 +9,3 @@ mock
# Required for optional extensions (only the ones supported on py3)
pystache
pyYaml
pyinotify
1 change: 0 additions & 1 deletion requirements-dev.txt
Expand Up @@ -13,4 +13,3 @@ pyYaml
configobj
pylibmc
genshi
pyinotify
4 changes: 2 additions & 2 deletions scripts/travis.sh
Expand Up @@ -9,9 +9,9 @@ fi

PYCHECK=$(python -c 'import sys; print(sys.version_info > (3, 0))')
if [ "$PYCHECK" == "True" ]; then
pip install -r requirements-dev-py3.txt --use-mirrors
pip install -r requirements-dev-py3-linux.txt --use-mirrors
else
pip install -r requirements-dev.txt --use-mirrors
pip install -r requirements-dev-linux.txt --use-mirrors
fi

python setup.py nosetests
Expand Down
4 changes: 2 additions & 2 deletions scripts/vagrant/up.sh
Expand Up @@ -36,10 +36,10 @@ memcached &
deactivate ||:

source ~/.env/cement/bin/activate
pip install -r requirements-dev.txt
pip install -r requirements-dev-linux.txt
python setup.py develop

source ~/.env/cement-py3/bin/activate
pip install -r requirements-dev-py3.txt
pip install -r requirements-dev-py3-linux.txt
python setup.py develop

0 comments on commit 2019953

Please sign in to comment.