Merge remote-tracking branch 'origin/master'

cookiecutter.json

@@ -6,8 +6,8 @@
     "open_source_license": ["No license file", "MIT", "BSD-3-Clause"],
     "s3_bucket": "[OPTIONAL] your-bucket-for-syncing-data (do not include 's3://')",
     "aws_profile": "default",
-    "minio": "[OPTIONAL] your-minio-for-syncing-data (your shoud have installed rclone to sycn (https://rclone.org/install/))",
+    "minio": "[OPTIONAL] your-minio-for-syncing-data in rclone format, i.e. minio-server:bucket (your shoud have installed rclone to sync (https://rclone.org/install/))",
     "minio_profile": "default",
-    // "git_remote_repo": "Your remote repo for this project",
+    "git_remote_repo": "Your remote repo for this project (default github.com)",
     "python_interpreter": ["python"]
 }

{{ cookiecutter.repo_name }}/Makefile

@@ -9,7 +9,7 @@ MINIO = {{ cookiecutter.minio }}
 MINIOPROFILE = {{ cookiecutter.minio_profile }}
 PROJECT_NAME = {{ cookiecutter.repo_name }}
 PYTHON_INTERPRETER = {{ cookiecutter.python_interpreter }}
-# GIT = {{ cookiecutter.git_remote_repo }}
+GIT = {{ cookiecutter.git_remote_repo }}
 USERNAME = {{ cookiecutter.author_name }}
 
 ifeq (,$(shell which conda))
@@ -65,14 +65,14 @@ endif
 ## Upload to minio
 sync_data_to_minio:
 ifeq (default,$(MINIOPROFILE))
-	rclone sync data/ $(MINIO):$(PROJECT_NAME)/data/ --stats-one-line -P --stats 2s
-	rclone sync models/ $(MINIO):$(PROJECT_NAME)/models/ --stats-one-line -P --stats 2s
+	rclone sync data/ $(MINIO)/$(PROJECT_NAME)/data/ --stats-one-line -P --stats 2s
+	rclone sync models/ $(MINIO)/$(PROJECT_NAME)/models/ --stats-one-line -P --stats 2s
 
 ## Download from minio
 sync_data_from_minio:
 ifeq (default,$(MINIOPROFILE))
-	rclone sync $(MINIO):$(PROJECT_NAME)/data/ data/ --stats-one-line -P --stats 2s
-	rclone sync $(MINIO):$(PROJECT_NAME)/models/ models/ --stats-one-line -P --stats 2s
+	rclone sync $(MINIO)/$(PROJECT_NAME)/data/ data/ --stats-one-line -P --stats 2s
+	rclone sync $(MINIO)/$(PROJECT_NAME)/models/ models/ --stats-one-line -P --stats 2s
 
 
 ## Initial set up of python interpreter environment, version control and pre-commit hooks