Skip to content

Commit

Permalink
Fix git tag in conda recipe and allow make clean to fail
Browse files Browse the repository at this point in the history
  • Loading branch information
gb119 committed Apr 12, 2020
1 parent f6fb64d commit 0d9454d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -9,9 +9,9 @@ BRANCH = `git branch | grep '*' | cut -d ' ' -f 2`

clean:
$(MAKE) -C doc clean
rm dist/*
rm -rf build/*
find -name '__pycache__' -exec rm -rf {} \;
- rm dist/*
- rm -rf build/*
- find -name '__pycache__' -exec rm -rf {} \;

test:
$(PYTHON_SETUP) test
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Expand Up @@ -7,7 +7,7 @@ package:
version: '0.9.6'

source:
git_tag: master
git_tag: v0.9.6
git_url: https://github.com/stonerlab/Stoner-PythonCode.git
build:
number: 0
Expand Down
4 changes: 3 additions & 1 deletion scripts/VSManalysis_v2.py
Expand Up @@ -230,7 +230,9 @@ def editData(Data, operations):
)
break
except ValueError:
timeout += 1 # if get 5 files unreadable in a row then finish the program
timeout += (
1
) # if get 5 files unreadable in a row then finish the program
print("Could not read file ", path)
if timeout <= 5:
break
Expand Down

0 comments on commit 0d9454d

Please sign in to comment.