Merge pull request #181 from hackalog/minor_cleanups

Minor cleanups

cookiecutter.json

@@ -5,7 +5,6 @@
     "author_name": "Your name (or your organization/company/team)",
     "description": "A short description of this project.",
     "open_source_license": ["MIT", "BSD-2-Clause", "Proprietary"],
-    "virtualenv": ["conda"],
-    "python_version": ["latest", "3.8", "3.7", "3.6"],
+    "python_version": ["3.7", "3.6", "latest", "3.8"],
     "conda_path": "~/anaconda3/bin/conda"
 }

{{ cookiecutter.repo_name }}/.gitignore

@@ -75,8 +75,9 @@ target/
 # Jupyter NB Checkpoints
 .ipynb_checkpoints/
 
-# exclude data from source control by default
+# exclude data and local config from source control by default
 /data/
+catalog/config.ini
 
 # Mac OS-specific storage files
 .DS_Store

{{ cookiecutter.repo_name }}/.post-create-environment.txt

@@ -2,9 +2,9 @@
 
 NOTE: By default, raw data is installed and unpacked in the
 `{{ cookiecutter.repo_name}}/data` directory. If you are working with big data (or
-have a small disk partition), it is HIGHLY recommended that you move
-this directory elsewhere; i.e. either move it and leave a symlink
-behind, or change its location by setting {{ cookiecutter.module_name }}.paths['data_path']
-accordingly.
+have a small disk partition), it is HIGHLY recommended that you point
+this directory elsewhere; i.e. by setting paths['data_path']. For example:
+>>> conda activate {{ cookiecutter.repo_name }}
+>>> python -c "import {{ cookiecutter.module_name }}; {{ cookiecutter.module_name }}.paths['data_path'] = '/path/to/big/data'"
 
 You have been warned.

{{ cookiecutter.repo_name }}/Makefile

@@ -108,25 +108,20 @@ debug:
 	@echo "\n\n======================"
 	@echo "\nPlease include the contents $(DEBUG_FILE) when submitting an issue or support request.\n"
 	@echo "======================\n\n"
-	@echo "\n======================\n">> $(DEBUG_FILE)
-	@echo "Git status" >> $(DEBUG_FILE)
-	@echo "\n======================\n">> $(DEBUG_FILE)
+	@echo "##\n## Git status\n##\n" > $(DEBUG_FILE)
 	git status >> $(DEBUG_FILE)
-	@echo "\n======================\n" >> $(DEBUG_FILE)
+	@echo "\n##\n## git log\n##\n" >> $(DEBUG_FILE)
 	git log -8 --graph --oneline --decorate --all >> $(DEBUG_FILE)
-	@echo "\n======================\n" >> $(DEBUG_FILE)
-	@echo "\n======================\n" >> $(DEBUG_FILE)
-	@echo "Github status" >> $(DEBUG_FILE)
-	@echo "\n======================\n" >> $(DEBUG_FILE)
+	@echo "\n##\n## Github remotes\n##\n" >> $(DEBUG_FILE)
 	git remote -v >> $(DEBUG_FILE)
-	@echo "\n======================\n" >> $(DEBUG_FILE)
+	@echo "\n##\n## github SSH credentials\n##\n" >> $(DEBUG_FILE)
 	ssh [email protected] 2>&1 | cat >> $(DEBUG_FILE)
-	@echo "\n======================\n" >> $(DEBUG_FILE)
-	@echo "\n======================\n" >> $(DEBUG_FILE)
-	@echo "Environment status" >> $(DEBUG_FILE)
-	@echo "\n======================\n" >> $(DEBUG_FILE)
+	@echo "\n##\n## Conda config\n##\n" >> $(DEBUG_FILE)
+	$(CONDA_EXE) config --get >> $(DEBUG_FILE)
+	@echo "\n##\n## Conda info\n##\n" >> $(DEBUG_FILE)
+	$(CONDA_EXE) info  >> $(DEBUG_FILE)
+	@echo "\n##\n## Conda list\n##\n" >> $(DEBUG_FILE)
 	$(CONDA_EXE) list >> $(DEBUG_FILE)
-	@echo "\n======================\n" >> $(DEBUG_FILE)
 
 #################################################################################
 # PROJECT RULES                                                                 #

{{ cookiecutter.repo_name }}/Makefile.include

@@ -1,9 +1,9 @@
-ARCH := $(shell arch)
 CONDA_EXE ?= {{ cookiecutter.conda_path }}
 DEBUG_FILE := debug.txt
 MODULE_NAME := {{ cookiecutter.module_name }}
 TESTS_NO_CI = $(MODULE_NAME)/tests/no_ci
 PROJECT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 PROJECT_NAME := {{ cookiecutter.repo_name }}
 PYTHON_INTERPRETER := python3
-VIRTUALENV := {{ cookiecutter.virtualenv }}
+ARCH := $(shell $(PYTHON_INTERPRETER) -c "import platform; print(platform.platform())")
+VIRTUALENV := conda