Merge

hooks/post_gen_project.py

@@ -22,7 +22,7 @@
     import os
 
 {%- if cookiecutter.command_line_interface|lower == 'no' %}
-    os.unlink(join('src', '{{ cookiecutter.package_name }}', '__main__.py'))
+    os.unlink(join('src', '{{ cookiecutter.package_name|replace('-', '_') }}', '__main__.py'))
 {% endif %}
 
 {%- if cookiecutter.test_matrix_configurator|lower == 'no' %}

{{cookiecutter.repo_name}}/.bumpversion.cfg

@@ -5,4 +5,4 @@ tag = True
 
 [bumpversion:file:setup.py]
 [bumpversion:file:docs/conf.py]
-[bumpversion:file:src/{{ cookiecutter.package_name }}/__init__.py]
+[bumpversion:file:src/{{ cookiecutter.package_name|replace('-', '_') }}/__init__.py]

{{cookiecutter.repo_name}}/MANIFEST.in

@@ -18,4 +18,4 @@ include README.rst
 
 include tox.ini .travis.yml appveyor.yml
 
-global-exclude *.py[cod] __pycache__ *.so
+global-exclude *.py[cod] __pycache__ *.so *.dylib

{{cookiecutter.repo_name}}/ci/templates/tox.ini

@@ -59,7 +59,9 @@ deps =
     matrix
 skip_install = true
 commands =
-    python bootstrap.py
+    python ci/bootstrap.py
+passenv =
+    *
 
 [testenv:check]
 basepython = python3.4
@@ -141,7 +143,7 @@ commands =
 {%- if cookiecutter.test_runner|lower == "pytest" %}
     {posargs:py.test --cov --cov-report=term-missing -vv}
 {%- else %}
-    {posargs:nosetests --with-coverage --cover-package={{ cookiecutter.package_name }}}
+    {posargs:nosetests --with-coverage --cover-package={{ cookiecutter.package_name|replace('-', '_') }}}
 {%- endif %}
 {%- raw %}
 {% endif %}

{{cookiecutter.repo_name}}/docs/reference/index.rst

@@ -4,4 +4,4 @@ Reference
 .. toctree::
     :glob:
 
-    {{cookiecutter.package_name}}*
+    {{ cookiecutter.package_name|replace('-', '_') }}*

{{cookiecutter.repo_name}}/docs/reference/{{cookiecutter.package_name}}.rst

@@ -1,5 +1,5 @@
-{{cookiecutter.package_name}}
-=============================
+{{ cookiecutter.package_name|replace('-', '_') }}
+{{ "=" * cookiecutter.package_name|length }}
 
-.. automodule:: {{cookiecutter.package_name}}
+.. automodule:: {{ cookiecutter.package_name|replace('-', '_') }}
     :members:

{{cookiecutter.repo_name}}/docs/usage.rst

@@ -4,4 +4,4 @@ Usage
 
 To use {{ cookiecutter.project_name }} in a project::
 
-	import {{ cookiecutter.package_name }}
+	import {{ cookiecutter.package_name|replace('-', '_') }}

{{cookiecutter.repo_name}}/setup.cfg

@@ -36,9 +36,9 @@ addopts =
 [isort]
 force_single_line=True
 line_length=120
-known_first_party={{ cookiecutter.package_name }}
+known_first_party={{ cookiecutter.package_name|replace('-', '_') }}
 default_section=THIRDPARTY
-forced_separate=test_{{ cookiecutter.package_name }}
+forced_separate=test_{{ cookiecutter.package_name|replace('-', '_') }}
 {%- if cookiecutter.test_matrix_configurator|lower == "yes" %}
 
 [matrix]
@@ -82,4 +82,4 @@ coverage_flags =
 
 environment_variables =
     -
-{% endif %}
+{% endif %}

{{cookiecutter.repo_name}}/setup.py

@@ -117,7 +117,7 @@ def _unavailable(self, e):
 {%- if cookiecutter.command_line_interface|lower in ['plain', 'click'] %}
     entry_points={
         'console_scripts': [
-            '{{ cookiecutter.distribution_name }} = {{ cookiecutter.package_name }}.__main__:main',
+            '{{ cookiecutter.distribution_name }} = {{ cookiecutter.package_name|replace('-', '_') }}.__main__:main',
         ]
     },
 {%- endif %}

{{cookiecutter.repo_name}}/tox.ini

@@ -54,7 +54,7 @@ commands =
 {%- if cookiecutter.test_runner|lower == "pytest" %}
     {posargs:py.test --cov --cov-report=term-missing -vv}
 {%- else %}
-    {posargs:nosetests --with-coverage --cover-package={{ cookiecutter.package_name }}}
+    {posargs:nosetests --with-coverage --cover-package={{ cookiecutter.package_name|replace('-', '_') }}}
 {%- endif %}
 usedevelop = true