Skip to content

Commit 442ac0d

Browse files
authored
Merge pull request #115 from moremoban/remove-empty-console-script
Remove empty console script, fix setup.py.jj2
2 parents 1aa0efe + 496943e commit 442ac0d

File tree

7 files changed

+20
-1
lines changed

7 files changed

+20
-1
lines changed

CHANGELOG.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ Change log
44
0.0.8 - tba
55
--------------------------------------------------------------------------------
66

7+
Fixed
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
#. `#114 <https://github.com/moremoban/pypi-mobans/issues/114>`_: setup.py.jj2
11+
gets default console_scripts entry always
12+
13+
0.0.8 - tba
14+
--------------------------------------------------------------------------------
15+
716
Updated
817
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
918

changelog.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: pypi-mobans
22
organisation: moremoban
33
releases:
4+
- changes:
5+
- action: Fixed
6+
details:
7+
- "`#114`: setup.py.jj2 gets default console_scripts entry always"
8+
date: tba
9+
version: 0.0.8
410
- changes:
511
- action: Updated
612
details:

templates/docs/Makefile.jj2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ help:
1818
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
1919
%: Makefile
2020
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
21+

templates/docs/conf.py_t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,4 @@ intersphinx_mapping = {'https://docs.python.org/': None}
114114
# If true, `todo` and `todoList` produce output, else they produce nothing.
115115
todo_include_todos = True
116116
{%- endif %}
117+

templates/docs/make.bat.jj2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ goto end
3333

3434
:end
3535
popd
36+

templates/docs/master_doc.rst_t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ Indices and tables
1818
* :ref:`genindex`
1919
* :ref:`modindex`
2020
* :ref:`search`
21+

templates/setup.py.jj2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ MAINTAINER_CONTACT = "{{maintainer_contact}}"
8888
{% endif %}
8989
{% if command_line_interface or entry_points %}
9090
ENTRY_POINTS = {
91-
{% if not entry_points or 'console_scripts' not in entry_points %}
91+
{% if (not entry_points or 'console_scripts' not in entry_points) and command_line_interface %}
9292
"console_scripts": [
9393
"{{command_line_interface}} = {{ entry_point }}"
9494
],

0 commit comments

Comments
 (0)