diff --git a/README.rst b/README.rst index f210f23..33502bb 100644 --- a/README.rst +++ b/README.rst @@ -46,7 +46,6 @@ Prompts (e.g. ``adafruit-circuitpython-pca9685, adafruit-circuitpython-motor``). NOTE: ``Adafruit-Blinka`` is always included, so no need to include it here. * ``pypi_release`` - Will this library be releaased on PyPI? If so, enter ``y`` or ``yes`` to include the setup.py. For Adafruit libraries this defaults to Yes. * ``sphinx_docs`` - Should the Sphinx based documentation be included in your repo? If so, enter ``y`` or ``yes`` to include the setup.py. For Adafruit libraries this defaults to Yes. -* ``default_branch`` - What is the default branch used in your Githiub repos? Choice of Master or Main. For Adafruit libraries this defaults to Master. Post Generation Cleanup diff --git a/cookiecutter.json b/cookiecutter.json index 877d4a3..46602a9 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -16,7 +16,6 @@ "other_requirements": "", "pypi_release": "{%- if cookiecutter.target_bundle == 'Adafruit' -%} yes {%- else -%} no {%- endif -%}", "sphinx_docs": "{%- if cookiecutter.target_bundle == 'Adafruit' -%} yes {%- else -%} no {%- endif -%}", - "default_branch": ["master", "main"], "_extensions": ["jinja2.ext.do"], "_copy_without_render": ["*.github/*"] } diff --git a/tests/test_make_cookies.py b/tests/test_make_cookies.py index e45be9f..3bc7f31 100644 --- a/tests/test_make_cookies.py +++ b/tests/test_make_cookies.py @@ -118,8 +118,6 @@ def test_new_cookiecutter_all_entries(): test_context[key] = 'community' if key == "pypi_release": test_context[key] = 'yes' - if key == "default_branch": - test_context[key] = 'master' else: test_context[key] = 'test' else: diff --git a/{% if cookiecutter.library_prefix %}{{ cookiecutter.library_prefix | capitalize }}_{% endif %}CircuitPython_{{ cookiecutter.library_name}}/README.rst b/{% if cookiecutter.library_prefix %}{{ cookiecutter.library_prefix | capitalize }}_{% endif %}CircuitPython_{{ cookiecutter.library_name}}/README.rst index d9f669e..7fdb19b 100644 --- a/{% if cookiecutter.library_prefix %}{{ cookiecutter.library_prefix | capitalize }}_{% endif %}CircuitPython_{{ cookiecutter.library_name}}/README.rst +++ b/{% if cookiecutter.library_prefix %}{{ cookiecutter.library_prefix | capitalize }}_{% endif %}CircuitPython_{{ cookiecutter.library_name}}/README.rst @@ -111,7 +111,7 @@ Contributing ============ Contributions are welcome! Please read our `Code of Conduct -`_ +`_ before contributing to help this project stay welcoming. Documentation