Fix use of template on windows introducing "py_pkg_name" template var…

…iable See https://cookiecutter.readthedocs.io/en/latest/advanced/templates_in_context.html
nwb-extensions · May 19, 2019 · 1c490cf · 1c490cf
1 parent 526638e
commit 1c490cf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/cookiecutter.json b/cookiecutter.json
@@ -7,5 +7,6 @@
   "github_name": "myname",
   "copyright": "2019, {{ cookiecutter.author }}",
   "version": "0.1.0",
-  "release": "alpha"
+  "release": "alpha",
+  "py_pkg_name": "{{ cookiecutter.namespace|replace('-', '_') }}"
 }
diff --git a/{{ cookiecutter.namespace }}/.gitignore b/{{ cookiecutter.namespace }}/.gitignore
@@ -5,7 +5,7 @@ docs/source/_static
 !docs/source/_static/theme_overrides.css
 
 # copied spec files
-src/pynwb/{{ cookiecutter.namespace|replace("-", "_") }}/spec/*.yaml
+src/pynwb/{{ cookiecutter.py_pkg_name }}/spec/*.yaml
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

diff --git a/{{ cookiecutter.namespace }}/NEXTSTEPS.md b/{{ cookiecutter.namespace }}/NEXTSTEPS.md
@@ -35,7 +35,7 @@ update `setup.py` setting the `package_data` and `include_package_data` keyword
 ```python
 setup_args = {
     # [...]
-    'package_data': {'{{ cookiecutter.namespace|replace("-", "_") }}': [
+    'package_data': {'{{ cookiecutter.py_pkg_name }}': [
         'spec/{{ cookiecutter.namespace }}.namespace.yaml',
         'spec/{{ cookiecutter.namespace }}.extensions.yaml',
     ]},

diff --git a/{{ cookiecutter.namespace }}/setup.py b/{{ cookiecutter.namespace }}/setup.py
@@ -18,7 +18,7 @@
     ],
     'packages': find_packages('src/pynwb'),
     'package_dir': {'': 'src/pynwb'},
-    'package_data': {'{{ cookiecutter.namespace|replace("-", "_") }}': [
+    'package_data': {'{{ cookiecutter.py_pkg_name }}': [
         'spec/{{ cookiecutter.namespace }}.namespace.yaml',
         'spec/{{ cookiecutter.namespace }}.extensions.yaml',
     ]},
@@ -34,7 +34,7 @@ def _copy_spec_files(project_dir):
     ns_path = os.path.join(project_dir, 'spec', '{{ cookiecutter.namespace }}.namespace.yaml')
     ext_path = os.path.join(project_dir, 'spec', '{{ cookiecutter.namespace }}.extensions.yaml')
 
-    dst_dir = os.path.join(project_dir, 'src', 'pynwb', '{{ cookiecutter.namespace|replace("-", "_") }}', 'spec')
+    dst_dir = os.path.join(project_dir, 'src', 'pynwb', '{{ cookiecutter.py_pkg_name }}', 'spec')
     if not os.path.exists(dst_dir):
         os.mkdir(dst_dir)
 

diff --git a/...amespace|replace("-", "_") }}/__init__.py → ...{ cookiecutter.py_pkg_name }}/__init__.py b/...amespace|replace("-", "_") }}/__init__.py → ...{ cookiecutter.py_pkg_name }}/__init__.py