From daf604da405768f3f1253fd2f79dc24153e78a80 Mon Sep 17 00:00:00 2001 From: chfw Date: Sat, 29 Aug 2020 00:47:40 +0100 Subject: [PATCH 01/14] :bug: update moban-update --- statics/moban-update.yml | 2 +- tests/requirements.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/statics/moban-update.yml b/statics/moban-update.yml index d745b13..3adf8c4 100644 --- a/statics/moban-update.yml +++ b/statics/moban-update.yml @@ -14,7 +14,7 @@ jobs: python-version: '3.7' - name: check changes run: | - pip install moban gitfs2 pypifs + pip install moban gitfs2 pypifs moban-jinja2-github moban git status git diff --exit-code diff --git a/tests/requirements.txt b/tests/requirements.txt index b63a214..b6c2424 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,3 +1,4 @@ +gease codecov moban>=0.6.4 pytest~=3.6.1 From 7665ca1e96ea6e2f859b4926ba0a32ee300f3030 Mon Sep 17 00:00:00 2001 From: chfw Date: Wed, 2 Sep 2020 21:46:33 +0100 Subject: [PATCH 02/14] :newspaper: add moban-jinja2-github as dependency --- templates/travis.yml.jj2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/travis.yml.jj2 b/templates/travis.yml.jj2 index eccd2eb..754052e 100644 --- a/templates/travis.yml.jj2 +++ b/templates/travis.yml.jj2 @@ -62,7 +62,7 @@ stages: env: - MINREQ=0 stage: moban - install: pip install moban>=0.0.4 gitfs2 pypifs + install: pip install moban>=0.0.4 gitfs2 pypifs moban-jinja2-github {% if moban_command.startswith('moban') and 'exit-code' not in moban_command %} script: - {{ moban_command }} From 587f1b2e70bb6d5a49e9156ddf112fbbb4c0d718 Mon Sep 17 00:00:00 2001 From: chfw Date: Fri, 4 Sep 2020 22:12:14 +0100 Subject: [PATCH 03/14] :newspaper: add moban-ansible as dependency --- templates/travis.yml.jj2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/travis.yml.jj2 b/templates/travis.yml.jj2 index 754052e..b9f7470 100644 --- a/templates/travis.yml.jj2 +++ b/templates/travis.yml.jj2 @@ -62,7 +62,7 @@ stages: env: - MINREQ=0 stage: moban - install: pip install moban>=0.0.4 gitfs2 pypifs moban-jinja2-github + install: pip install moban>=0.0.4 gitfs2 pypifs moban-jinja2-github moban-ansible {% if moban_command.startswith('moban') and 'exit-code' not in moban_command %} script: - {{ moban_command }} From de4ca4a4cd58a0c05cb8402d1d16a91b48170c6b Mon Sep 17 00:00:00 2001 From: chfw Date: Sat, 5 Sep 2020 00:06:11 +0100 Subject: [PATCH 04/14] :lipstick: update yaml format --- templates/travis.yml.jj2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/travis.yml.jj2 b/templates/travis.yml.jj2 index b9f7470..aeaab9b 100644 --- a/templates/travis.yml.jj2 +++ b/templates/travis.yml.jj2 @@ -62,7 +62,7 @@ stages: env: - MINREQ=0 stage: moban - install: pip install moban>=0.0.4 gitfs2 pypifs moban-jinja2-github moban-ansible + install: pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible {% if moban_command.startswith('moban') and 'exit-code' not in moban_command %} script: - {{ moban_command }} From 72b2d91dcad57fd153991604172d98aeff39092c Mon Sep 17 00:00:00 2001 From: chfw Date: Sun, 6 Sep 2020 17:33:06 +0100 Subject: [PATCH 05/14] :sparkles: add moban-ansible as dependency --- statics/moban-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/statics/moban-update.yml b/statics/moban-update.yml index 3adf8c4..706fd82 100644 --- a/statics/moban-update.yml +++ b/statics/moban-update.yml @@ -14,7 +14,7 @@ jobs: python-version: '3.7' - name: check changes run: | - pip install moban gitfs2 pypifs moban-jinja2-github + pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible moban git status git diff --exit-code From 021c3511b0a62cf9cdb25618d7d1a3da8db9105c Mon Sep 17 00:00:00 2001 From: chfw Date: Sun, 13 Sep 2020 10:47:01 +0100 Subject: [PATCH 06/14] :newspaper: add half of the pypi-mobans that starts a new project here --- .travis.yml | 2 +- CHANGELOG.rst | 7 ++ changelog.yml | 6 ++ new-project/static/CHANGELOG.rst | 2 + new-project/static/CUSTOM_README.rst | 6 ++ new-project/static/MANIFEST.in | 2 + new-project/static/custom_setup.py.jj2 | 1 + new-project/static/setup.cfg | 2 + .../static/tests/custom_requirements.txt.jj2 | 7 ++ new-project/templates/Makefile | 21 ++++++ new-project/templates/__init__.py.jj2 | 3 + new-project/templates/changelog.yml | 9 +++ new-project/templates/project-moban.yml | 33 ++++++++ new-project/templates/project.yml | 24 ++++++ yehua.yml | 75 +++++++++++++++++++ 15 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 new-project/static/CHANGELOG.rst create mode 100644 new-project/static/CUSTOM_README.rst create mode 100644 new-project/static/MANIFEST.in create mode 100644 new-project/static/custom_setup.py.jj2 create mode 100644 new-project/static/setup.cfg create mode 100644 new-project/static/tests/custom_requirements.txt.jj2 create mode 100644 new-project/templates/Makefile create mode 100644 new-project/templates/__init__.py.jj2 create mode 100644 new-project/templates/changelog.yml create mode 100644 new-project/templates/project-moban.yml create mode 100644 new-project/templates/project.yml create mode 100644 yehua.yml diff --git a/.travis.yml b/.travis.yml index 89ce480..24395fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ stages: env: - MINREQ=0 stage: moban - install: pip install moban>=0.0.4 gitfs2 pypifs + install: pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible script: make upstreaming git-diff-check jobs: diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a448422..2416a32 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,13 @@ Change log ================================================================================ +0.1.0 - 13.09.20220 +-------------------------------------------------------------------------------- + +**added** + +#. new project starter kits is relocated from yehua here + 0.0.12 - 26.08.20220 -------------------------------------------------------------------------------- diff --git a/changelog.yml b/changelog.yml index e350917..8872765 100644 --- a/changelog.yml +++ b/changelog.yml @@ -1,6 +1,12 @@ name: pypi-mobans organisation: moremoban releases: + - changes: + - action: added + details: + - "new project starter kits is relocated from yehua here" + date: 13.09.20220 + version: 0.1.0 - changes: - action: added details: diff --git a/new-project/static/CHANGELOG.rst b/new-project/static/CHANGELOG.rst new file mode 100644 index 0000000..7398c8c --- /dev/null +++ b/new-project/static/CHANGELOG.rst @@ -0,0 +1,2 @@ +Change log +=========== diff --git a/new-project/static/CUSTOM_README.rst b/new-project/static/CUSTOM_README.rst new file mode 100644 index 0000000..ae8b966 --- /dev/null +++ b/new-project/static/CUSTOM_README.rst @@ -0,0 +1,6 @@ +{% extends 'README.rst.jj2' %} + +{%block documentation_link%} +.. image:: https://dev.azure.com/{{organisation}}/{{name}}/_apis/build/status/{{organisation}}.{{name}}?branchName=master + :target: https://dev.azure.com/{{organisation}}/{{name}}/_build/latest?definitionId=2&branchName=master +{%endblock%} diff --git a/new-project/static/MANIFEST.in b/new-project/static/MANIFEST.in new file mode 100644 index 0000000..5f13ef0 --- /dev/null +++ b/new-project/static/MANIFEST.in @@ -0,0 +1,2 @@ +include README.rst +include CHANGELOG.rst diff --git a/new-project/static/custom_setup.py.jj2 b/new-project/static/custom_setup.py.jj2 new file mode 100644 index 0000000..2f700ec --- /dev/null +++ b/new-project/static/custom_setup.py.jj2 @@ -0,0 +1 @@ +{% extends "setup.py.jj2" %} diff --git a/new-project/static/setup.cfg b/new-project/static/setup.cfg new file mode 100644 index 0000000..2a9acf1 --- /dev/null +++ b/new-project/static/setup.cfg @@ -0,0 +1,2 @@ +[bdist_wheel] +universal = 1 diff --git a/new-project/static/tests/custom_requirements.txt.jj2 b/new-project/static/tests/custom_requirements.txt.jj2 new file mode 100644 index 0000000..6b56e5a --- /dev/null +++ b/new-project/static/tests/custom_requirements.txt.jj2 @@ -0,0 +1,7 @@ +{% extends "tests/requirements.txt.jj2" %} + +{%block extras %} +moban +black;python_version>="3.6" +isort;python_version>="3.6" +{%endblock%} diff --git a/new-project/templates/Makefile b/new-project/templates/Makefile new file mode 100644 index 0000000..51e0bd2 --- /dev/null +++ b/new-project/templates/Makefile @@ -0,0 +1,21 @@ +all: test + +test: lint + bash test.sh + +install_test: + pip install -r tests/requirements.txt + +git-diff-check: + git diff --exit-code + +lint: + bash lint.sh + +format: + isort -y $(find {{project_name | replace('-', '_')}} -name "*.py"|xargs echo) $(find tests -name "*.py"|xargs echo) + black -l 79 {{project_name | replace('-', '_')}} + black -l 79 tests + +git-diff-check: + git diff --exit-code diff --git a/new-project/templates/__init__.py.jj2 b/new-project/templates/__init__.py.jj2 new file mode 100644 index 0000000..05d6564 --- /dev/null +++ b/new-project/templates/__init__.py.jj2 @@ -0,0 +1,3 @@ +# flake8: noqa +from {{project_name | replace('-', '_')}}._version import __version__ +from {{project_name | replace('-', '_')}}._version import __author__ diff --git a/new-project/templates/changelog.yml b/new-project/templates/changelog.yml new file mode 100644 index 0000000..550e150 --- /dev/null +++ b/new-project/templates/changelog.yml @@ -0,0 +1,9 @@ +name: {{project_name}} +organisation: {{organisation}} +releases: +- changes: + - action: first release + details: + - what a feat! + version: 0.0.1 + date: {{today}} diff --git a/new-project/templates/project-moban.yml b/new-project/templates/project-moban.yml new file mode 100644 index 0000000..489c9cf --- /dev/null +++ b/new-project/templates/project-moban.yml @@ -0,0 +1,33 @@ +configuration: + template_dir: + - "pypi://pypi-mobans-pkg/resources/templates" + - "pypi://pypi-mobans-pkg/resources/statics" + - ".moban.d" + configuration: {{ project_name }}.yml +targets: + - README.rst: CUSTOM_README.rst.jj2 + - setup.py: custom_setup.py.jj2 + - requirements.txt: requirements.txt.jj2 + - "tests/requirements.txt": "tests/custom_requirements.txt.jj2" + - "docs/source/conf.py": "docs/conf.py_t" + - test.sh: test.script.jj2 + - test.bat: test.script.jj2 + - "{{ project_name | replace('-', '_') }}/_version.py": "_version.py.jj2" + - .gitignore: gitignore.jj2 + - .travis.yml: travis.yml.jj2 + - Pipfile: Pipfile.jj2 + - output: CHANGELOG.rst + configuration: changelog.yml + template: CHANGELOG.rst.jj2 + - lint.sh: lint.script.jj2 + - LICENSE: "{{ license|lower }}_license.jj2" + - MANIFEST.in: MANIFEST.in.jj2 + - ".github/workflows/pythonpublish.yml": "pythonpublish.yml" + - ".github/workflows/moban-update.yml": "moban-update.yml" + - "azure-pipelines.yml": "azure/azure-pipelines.yml" + - ".azure-pipelines-steps-macos.yml": "azure/pipelines-steps-macos.yml" + - ".azure-pipelines-steps.yml": "azure/pipelines-steps.yml" + - Makefile: Makefile.jj2 + - format.sh: format.sh.jj2 + - .isort.cfg: isort.cfg.jj2 + - CONTRIBUTORS.rst: CONTRIBUTORS.rst.jj2 diff --git a/new-project/templates/project.yml b/new-project/templates/project.yml new file mode 100644 index 0000000..f190eb7 --- /dev/null +++ b/new-project/templates/project.yml @@ -0,0 +1,24 @@ +name: "{{project_name}}" +organisation: "{{organisation}}" +author: "{{author}}" +contact: "{{contact}}" +company: "{{company}}" +version: "0.0.1" +current_version: "0.0.1" +release: "0.0.0" +copyright_year: {{now.year}} +{% if project_type == 'command line interface'%} +command_line_interface: "{{cli}}" +entry_point: "{{project_name | replace('-', '_')}}.main:main" +{% endif %} +{% if project_type == 'C extension'%} +external_module_library: {{project_name}} +sources: +{% for source in sources: %} + - '{{source}}' +{% endfor %} +{% endif %} +license: {{license}} +dependencies: [] +description: "{{description}}" +lint_command: make install_test lint format git-diff-check diff --git a/yehua.yml b/yehua.yml new file mode 100644 index 0000000..967203f --- /dev/null +++ b/yehua.yml @@ -0,0 +1,75 @@ +introduction: |+ + [info]Yehua /'jɛhwa/[/info] will walk you through creating a blank python package. + Press ^C to quit at any time. + +configuration: + template_path: ./new-project/templates + static_path: ./new-project/static +questions: + - project_name: "project name [yehua-boilerplate]: " + - description: "description [Moremoban organisation's best template]: " + - license: + - question: "license: " + "1. mit": "N/A" + "2. newbsd": "N/A" + - author: "author: " + - contact: "contact email: " + - organisation: "github profile/organisation: " + - company: "copyright owner [{{author}}]: " + - project_type: + - question: "project type: " + "1. library": "N/A" + "2. command line interface": + - cli: "cli executable name: " +layout: + - "{{project_name|lower|replace('-', '_')}}" + - tests + - docs: + - source + - .moban.d: + - tests + - docs: + - source +templates: + - "{{project_name}}.yml": project.yml + - "{{project_name | replace('-', '_')}}/__init__.py": "__init__.py.jj2" + - .moban.yml: project-moban.yml + - changelog.yml: changelog.yml + - Makefile: Makefile +static: + - ".moban.d/CUSTOM_README.rst.jj2": "CUSTOM_README.rst" + - ".moban.d/custom_setup.py.jj2": custom_setup.py.jj2 + - ".moban.d/tests/custom_requirements.txt.jj2": "tests/custom_requirements.txt.jj2" + - CHANGELOG.rst: CHANGELOG.rst + - setup.cfg: setup.cfg +post-moban: + git-repo-files: + - "CHANGELOG.rst" + - "MANIFEST.in" + - "Makefile" + - "README.rst" + - "{{project_name}}.yml" + - "{{project_name | replace('-', '_')}}" + - "docs" + - "requirements.txt" + - "setup.cfg" + - "setup.py" + - "test.sh" + - "tests" + - ".gitignore" + - ".github" + - ".moban.d" + - ".travis.yml" + - ".moban.yml" + - "Pipfile" + - "changelog.yml" + - "lint.sh" + - "test.bat" + - "azure-pipelines.yml" + - ".azure-pipelines-steps-macos.yml" + - ".azure-pipelines-steps.yml" + - "LICENSE" + - format.sh + - lint.sh + - .isort.cfg + - CONTRIBUTORS.rst From 492c283b7c30d9b7713bb0af355a90499117ba37 Mon Sep 17 00:00:00 2001 From: chfw Date: Sun, 13 Sep 2020 10:50:54 +0100 Subject: [PATCH 07/14] :horse: refactor the files --- new-project/templates/{changelog.yml => changelog.yml.jj2} | 0 .../templates/{project-moban.yml => project-moban.yml.jj2} | 0 new-project/templates/{project.yml => project.yml.jj2} | 0 yehua.yml | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename new-project/templates/{changelog.yml => changelog.yml.jj2} (100%) rename new-project/templates/{project-moban.yml => project-moban.yml.jj2} (100%) rename new-project/templates/{project.yml => project.yml.jj2} (100%) diff --git a/new-project/templates/changelog.yml b/new-project/templates/changelog.yml.jj2 similarity index 100% rename from new-project/templates/changelog.yml rename to new-project/templates/changelog.yml.jj2 diff --git a/new-project/templates/project-moban.yml b/new-project/templates/project-moban.yml.jj2 similarity index 100% rename from new-project/templates/project-moban.yml rename to new-project/templates/project-moban.yml.jj2 diff --git a/new-project/templates/project.yml b/new-project/templates/project.yml.jj2 similarity index 100% rename from new-project/templates/project.yml rename to new-project/templates/project.yml.jj2 diff --git a/yehua.yml b/yehua.yml index 967203f..7415254 100644 --- a/yehua.yml +++ b/yehua.yml @@ -31,10 +31,10 @@ layout: - docs: - source templates: - - "{{project_name}}.yml": project.yml + - "{{project_name}}.yml": project.yml.jj2 - "{{project_name | replace('-', '_')}}/__init__.py": "__init__.py.jj2" - - .moban.yml: project-moban.yml - - changelog.yml: changelog.yml + - .moban.yml: project-moban.yml.jj2 + - changelog.yml: changelog.yml.jj2 - Makefile: Makefile static: - ".moban.d/CUSTOM_README.rst.jj2": "CUSTOM_README.rst" From 6656ef145725ceece6ffcfa963c7e8255f690604 Mon Sep 17 00:00:00 2001 From: chfw Date: Sun, 13 Sep 2020 11:04:42 +0100 Subject: [PATCH 08/14] :lipstick: update yehua file --- yehua.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/yehua.yml b/yehua.yml index 7415254..be0e881 100644 --- a/yehua.yml +++ b/yehua.yml @@ -1,6 +1,6 @@ introduction: |+ - [info]Yehua /'jɛhwa/[/info] will walk you through creating a blank python package. - Press ^C to quit at any time. + [info]Yehua /'jɛhwa/[/info] will walk you through creating a + blank python package. Press ^C to quit at any time. configuration: template_path: ./new-project/templates @@ -9,18 +9,18 @@ questions: - project_name: "project name [yehua-boilerplate]: " - description: "description [Moremoban organisation's best template]: " - license: - - question: "license: " - "1. mit": "N/A" - "2. newbsd": "N/A" + - question: "license: " + "1. mit": "N/A" + "2. newbsd": "N/A" - author: "author: " - contact: "contact email: " - organisation: "github profile/organisation: " - company: "copyright owner [{{author}}]: " - project_type: - - question: "project type: " - "1. library": "N/A" - "2. command line interface": - - cli: "cli executable name: " + - question: "project type: " + "1. library": "N/A" + "2. command line interface": + - cli: "cli executable name: " layout: - "{{project_name|lower|replace('-', '_')}}" - tests @@ -39,7 +39,8 @@ templates: static: - ".moban.d/CUSTOM_README.rst.jj2": "CUSTOM_README.rst" - ".moban.d/custom_setup.py.jj2": custom_setup.py.jj2 - - ".moban.d/tests/custom_requirements.txt.jj2": "tests/custom_requirements.txt.jj2" + - ".moban.d/tests/custom_requirements.txt.jj2": | + "tests/custom_requirements.txt.jj2" - CHANGELOG.rst: CHANGELOG.rst - setup.cfg: setup.cfg post-moban: From 3b7101c2df567febae5611ec1a919e77e6816ffa Mon Sep 17 00:00:00 2001 From: chfw Date: Sun, 13 Sep 2020 11:11:42 +0100 Subject: [PATCH 09/14] :lipstick: update yehua file --- ...stom_requirements.txt.jj2 => requirements.txt.jj2} | 0 yehua.yml | 11 +++++------ 2 files changed, 5 insertions(+), 6 deletions(-) rename new-project/static/tests/{custom_requirements.txt.jj2 => requirements.txt.jj2} (100%) diff --git a/new-project/static/tests/custom_requirements.txt.jj2 b/new-project/static/tests/requirements.txt.jj2 similarity index 100% rename from new-project/static/tests/custom_requirements.txt.jj2 rename to new-project/static/tests/requirements.txt.jj2 diff --git a/yehua.yml b/yehua.yml index be0e881..6c2377f 100644 --- a/yehua.yml +++ b/yehua.yml @@ -25,11 +25,11 @@ layout: - "{{project_name|lower|replace('-', '_')}}" - tests - docs: - - source - - .moban.d: - - tests - - docs: - source + - .moban.d: + - tests + - docs: + - source templates: - "{{project_name}}.yml": project.yml.jj2 - "{{project_name | replace('-', '_')}}/__init__.py": "__init__.py.jj2" @@ -39,8 +39,7 @@ templates: static: - ".moban.d/CUSTOM_README.rst.jj2": "CUSTOM_README.rst" - ".moban.d/custom_setup.py.jj2": custom_setup.py.jj2 - - ".moban.d/tests/custom_requirements.txt.jj2": | - "tests/custom_requirements.txt.jj2" + - ".moban.d/tests/custom_requirements.txt.jj2": "tests/requirements.txt.jj2" - CHANGELOG.rst: CHANGELOG.rst - setup.cfg: setup.cfg post-moban: From 465544fd9e96be5c3a2c24193b347ca31bd5f549 Mon Sep 17 00:00:00 2001 From: chfw Date: Sun, 13 Sep 2020 11:14:07 +0100 Subject: [PATCH 10/14] :sparkles: enable auto upstreaming --- .github/workflow/moban-update.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflow/moban-update.yml diff --git a/.github/workflow/moban-update.yml b/.github/workflow/moban-update.yml new file mode 100644 index 0000000..a58316f --- /dev/null +++ b/.github/workflow/moban-update.yml @@ -0,0 +1,29 @@ +on: [push] + +jobs: + run_moban: + runs-on: ubuntu-latest + name: synchronize templates via moban + steps: + - uses: actions/checkout@v2 + with: + ref: ${{ github.head_ref }} + - name: Set up Python + uses: actions/setup-python@v1 + with: + python-version: '3.7' + - name: check changes + run: | + pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible + make upstreaming + git status + git diff --exit-code + - name: Auto-commit + if: failure() + uses: docker://cdssnc/auto-commit-github-action + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + args: >- + This is an auto-commit, updating project meta data, + such as changelog.rst, contributors.rst From 0d79451aaa80db8de0c45b58b4db066225432a75 Mon Sep 17 00:00:00 2001 From: chfw Date: Sun, 13 Sep 2020 11:16:19 +0100 Subject: [PATCH 11/14] :sparkles: enable auto upstreaming --- .github/{workflow => workflows}/moban-update.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{workflow => workflows}/moban-update.yml (100%) diff --git a/.github/workflow/moban-update.yml b/.github/workflows/moban-update.yml similarity index 100% rename from .github/workflow/moban-update.yml rename to .github/workflows/moban-update.yml From efacea8e1b2d86ab144e64c6fdf7b780be035073 Mon Sep 17 00:00:00 2001 From: chfw Date: Sun, 13 Sep 2020 11:20:59 +0100 Subject: [PATCH 12/14] :green_heart: update yehua and requirement files --- tests/requirements.txt | 3 ++- yehua.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index b6c2424..b35ab2f 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -3,5 +3,6 @@ codecov moban>=0.6.4 pytest~=3.6.1 flake8 -moban_jinja2_github yamllint +moban-jinja2-github +moban-ansible diff --git a/yehua.yml b/yehua.yml index 6c2377f..8bb3a74 100644 --- a/yehua.yml +++ b/yehua.yml @@ -1,6 +1,6 @@ introduction: |+ - [info]Yehua /'jɛhwa/[/info] will walk you through creating a - blank python package. Press ^C to quit at any time. + [info]Yehua /'jɛhwa/[/info] will walk you through. + Press ^C to quit at any time. configuration: template_path: ./new-project/templates From 317202d035873214a06166a2fb16736be300469c Mon Sep 17 00:00:00 2001 From: chfw Date: Sun, 13 Sep 2020 11:47:26 +0100 Subject: [PATCH 13/14] :green_heart: fix unit test failure --- tests/requirements.txt | 3 ++- tests/test_utils.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index b35ab2f..e54c8fc 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,8 +1,9 @@ gease codecov -moban>=0.6.4 +moban>=0.8.2 pytest~=3.6.1 flake8 yamllint moban-jinja2-github moban-ansible +gitfs2 diff --git a/tests/test_utils.py b/tests/test_utils.py index f835248..7d50eb1 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,5 +1,7 @@ import os +import moban_ansible.tests.files +import moban_ansible.engines.line_in_file from moban.plugins.jinja2.engine import Engine from moban.externals import file_system From 405157a9657bc44f3fed3fae05d8c2101115c882 Mon Sep 17 00:00:00 2001 From: chfw Date: Sun, 13 Sep 2020 11:49:41 +0100 Subject: [PATCH 14/14] :fire: no flake check on a test file --- tests/test_utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_utils.py b/tests/test_utils.py index 7d50eb1..628066a 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,3 +1,4 @@ +# flake8: noqa import os import moban_ansible.tests.files