From 0d9454d7bb924b206b53401bbc496c37792bcca0 Mon Sep 17 00:00:00 2001 From: Gavin Burnell Date: Sun, 12 Apr 2020 17:01:55 +0100 Subject: [PATCH] Fix git tag in conda recipe and allow make clean to fail --- Makefile | 6 +++--- recipe/meta.yaml | 2 +- scripts/VSManalysis_v2.py | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 532cc3b72..53fb9b019 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 10feb4e81..ddf3d0af1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -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 diff --git a/scripts/VSManalysis_v2.py b/scripts/VSManalysis_v2.py index 3466f937d..b4e0b87f2 100644 --- a/scripts/VSManalysis_v2.py +++ b/scripts/VSManalysis_v2.py @@ -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