Skip to content
This repository has been archived by the owner on Aug 15, 2020. It is now read-only.

Commit

Permalink
fixed issue with order in which dependencies were installed. fixed is…
Browse files Browse the repository at this point in the history 
…sue in print_cliner_dir.py

, did not work for releases since the name of the folder is CliNER-#.#.# not just cliner.
  • Loading branch information
@kwaco
kwaco committed Nov 16, 2015
1 parent 96929c5 commit 61ac630
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion install/cliner_dir/print_cliner_dir.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def main():
# Assumes this file never moves
base = back(back(back(os.path.abspath(__file__))))

if not base.endswith('CliNER'):
if 'CliNER' not in os.path.basename(base):
print >>sys.stderr, "\n\tERROR: Do not move file print_cliner_dir.py\n"
exit(1)
else:
Expand Down
3 changes: 1 addition & 2 deletions install/dependencies/install_python_dependencies.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ echo -e "\nSee python dependency details at: \n\t$DEPENDENCIES_DIR/log_installat


# Install python dependencies
pip install -r $DEPENDENCIES_DIR/../../requirements.txt &>> $log

cat $DEPENDENCIES_DIR/../../requirements.txt | xargs -n 1 -L 1 pip install

# Install nltk data
echo "downloading nltk data"
Expand Down
5 changes: 3 additions & 2 deletions install/virtualenv/create_virtualenv.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
# Virtual Environment?
if [[ ! $VIRTUAL_ENV ]] ; then

if [[ $CLINER_DIR = "" ]]; then
echo "CLINER_DIR not set"
# Exists?
if [[ -f $CLINER_DIR/venv_cliner ]] ; then
elif [[ -f $CLINER_DIR/venv_cliner ]] ; then
source $CLINER_DIR/venv_cliner/bin/activate
else
old=$(pwd)
Expand All @@ -20,6 +22,5 @@ if [[ ! $VIRTUAL_ENV ]] ; then
source venv_cliner/bin/activate
cd $old
fi

fi

1 comment on commit 61ac630

@kwaco
Copy link
Author

@kwaco kwaco commented on 61ac630 Nov 16, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

install/dependencies/install_python_dependencies.sh:
    Installs the requirements in a specific order because a problem
    arose where pip attempted to install scipy BEFORE numpy was installed, which gave an error.

install/cliner_dir/print_cliner_dir.py:
    For releases this would not work as the formatting of the root CliNER directory is named differently.
    I think this condition is just a sanity check?

Please sign in to comment.