Lean yehua - 0.1.3 (#68)

* 🔥 relocated embedded resources to pypi-mobans

* 📰 use pypi-mobans-pkg, instead of half in yehua and half in pypi-mobans

* This is an auto-commit, updating project meta data, such as changelog.rst, contributors.rst

* 💚 add the missing dependency

* This is an auto-commit, updating project meta data, such as changelog.rst, contributors.rst

* 💚 update travis file

* This is an auto-commit, updating project meta data, such as changelog.rst, contributors.rst

* 🤝 sync with pypi-mobans

* 💚 update unit tests

* This is an auto-commit, updating project meta data, such as changelog.rst, contributors.rst

* 🐛 use pypi-mobans-pkg v0.1.3

* This is an auto-commit, updating project meta data, such as changelog.rst, contributors.rst

* 🐛 update pypi-mobans-pkg version

* This is an auto-commit, updating project meta data, such as changelog.rst, contributors.rst

Co-authored-by: chfw <[email protected]>

Author: chfw

.github/workflows/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

.travis.yml

@@ -28,7 +28,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:
     - moban
     - git diff --exit-code

CHANGELOG.rst

@@ -1,6 +1,14 @@
 Change log
 ================================================================================
 
+0.1.3 - 13.09.2020
+--------------------------------------------------------------------------------
+
+**Updated**
+
+#. use pypi-mobans v0.1.0
+#. no longer, yehua has any template in itself.
+
 0.1.2 - 26.08.2020
 --------------------------------------------------------------------------------
 

changelog.yml

@@ -1,6 +1,13 @@
 name: yehua
 organisation: moremoban
 releases:
+- changes:
+  - action: Updated
+    details:
+    - "use pypi-mobans v0.1.0"
+    - no longer, yehua has any template in itself.
+  date: 13.09.2020
+  version: 0.1.3
 - changes:
   - action: Fixed
     details:

docs/source/conf.py

@@ -16,8 +16,8 @@
 spelling_word_list_filename = 'spelling_wordlist.txt'
 project = u'yehua'
 copyright = u'2017-2020 Onni Software Ltd.'
-version = '0.1.2'
-release = '0.1.2'
+version = '0.1.3'
+release = '0.1.3'
 exclude_patterns = []
 pygments_style = 'sphinx'
 html_theme = 'default'

requirements.txt

@@ -8,3 +8,4 @@ rich
 readchar
 colorama
 moban-jinja2-github>=0.0.2
+moban-ansible

setup.py

@@ -32,7 +32,7 @@
 
 NAME = "yehua"
 AUTHOR = "chfw"
-VERSION = "0.1.2"
+VERSION = "0.1.3"
 EMAIL = "[email protected]"
 LICENSE = "New BSD"
 ENTRY_POINTS = {
@@ -44,7 +44,7 @@
     "Yet another a project template tool for an organisation."
 )
 URL = "https://github.com/moremoban/yehua"
-DOWNLOAD_URL = "%s/archive/0.1.2.tar.gz" % URL
+DOWNLOAD_URL = "%s/archive/0.1.3.tar.gz" % URL
 FILES = ["README.rst","CONTRIBUTORS.rst", "CHANGELOG.rst"]
 KEYWORDS = [
     "python",
@@ -76,21 +76,22 @@
     "readchar",
     "colorama",
     "moban-jinja2-github>=0.0.2",
+    "moban-ansible",
 ]
 SETUP_COMMANDS = {}
 
 PACKAGES = find_packages(exclude=["ez_setup", "examples", "tests", "tests.*"])
 EXTRAS_REQUIRE = {
-    "pypi-mobans": ['pypi-mobans-pkg>=0.0.15'],
+    "pypi-mobans": ['pypi-mobans-pkg>=0.1.4'],
     "cookiecutter": ['cookiecutter==1.7.0'],
     ":python_version == '3.7'": ["ruamel.yaml>=0.15.42"],
     ":python_version != '3.4' and python_version < '3.7'": ["ruamel.yaml>=0.15.5"],
     ":python_version == '3.8'": ["ruamel.yaml>=0.15.98"],
 }
 # You do not need to read beyond this line
 PUBLISH_COMMAND = "{0} setup.py sdist bdist_wheel upload -r pypi".format(sys.executable)
-GS_COMMAND = ("gs yehua v0.1.2 " +
-              "Find 0.1.2 in changelog for more details")
+GS_COMMAND = ("gs yehua v0.1.3 " +
+              "Find 0.1.3 in changelog for more details")
 NO_GS_MESSAGE = ("Automatic github release is disabled. " +
                  "Please install gease to enable it.")
 UPLOAD_FAILED_MSG = (

tests/fixtures/project_yehua/.github/workflows/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-ansible
           moban
           git status
           git diff --exit-code

tests/fixtures/project_yehua/.travis.yml

@@ -32,7 +32,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:
     - moban
     - git diff --exit-code

tests/requirements.txt

@@ -14,4 +14,4 @@ pytest-cov
 cookiecutter
 gitfs2
 pypifs
-pypi-mobans-pkg==0.0.15
+pypi-mobans-pkg>=0.1.4

tests/test_main.py

@@ -87,9 +87,9 @@ def test_get_yehua_file_2():
 
 
 def test_get_yehua_file_3():
-    default_yehua_file = os.path.join("yehua", "resources", "yehua.yml")
+    default_yehua_file = 'pypi://pypi-mobans-pkg/resources/yehua.yml'
     yehua_file = get_yehua_file()
-    eq_(os.path.abspath(default_yehua_file), yehua_file)
+    eq_(default_yehua_file, yehua_file)
 
 
 @raises(SystemExit)

tests/test_project.py

@@ -72,30 +72,16 @@ def test_project_copy_static(self):
             ["CUSTOM_README.rst", "test-me/.moban.d/CUSTOM_README.rst.jj2"],
             ["custom_setup.py.jj2", "test-me/.moban.d/custom_setup.py.jj2"],
             [
-                "tests/custom_requirements.txt.jj2",
+                "requirements.txt.jj2",
                 "test-me/.moban.d/tests/custom_requirements.txt.jj2",
             ],
             ["CHANGELOG.rst", "test-me/CHANGELOG.rst"],
             ["setup.cfg", "test-me/setup.cfg"],
-            ["azure-pipelines.yml", "test-me/azure-pipelines.yml"],
-            [
-                "azure/pipelines-steps-macos.yml",
-                "test-me/.azure-pipelines-steps-macos.yml",
-            ],
-            [
-                "azure/pipelines-steps.yml",
-                "test-me/.azure-pipelines-steps.yml",
-            ],
-            [
-                "pythonpublish.yml",
-                "test-me/.github/workflows/pythonpublish.yml",
-            ],
         ]
-        basepath = os.path.join(os.getcwd(), "yehua", "resources", "static")
-        expected = [
-            [os.path.join(basepath, path[0]), path[1]] for path in expected
+        updated_calls = [
+            [os.path.basename(call[0]), call[1]] for call in calls
         ]
-        for call, expectee in zip(calls, expected):
+        for call, expectee in zip(updated_calls, expected):
             eq_(call, expectee)
 
     def test_project_templating(self):

yehua.yaml

@@ -4,9 +4,9 @@ organisation: "moremoban"
 author: chfw
 contact: "[email protected]"
 company: "Onni Software Ltd."
-version: "0.1.2"
-current_version: "0.1.2"
-release: "0.1.2"
+version: "0.1.3"
+current_version: "0.1.3"
+release: "0.1.3"
 copyright_year: 2017-2020
 command_line_interface: "yh"
 entry_point: "yehua.main:main"
@@ -25,9 +25,10 @@ dependencies:
   - readchar
   - colorama
   - moban-jinja2-github>=0.0.2
+  - moban-ansible
 extra_dependencies:
   - pypi-mobans:
-    - pypi-mobans-pkg>=0.0.15
+    - pypi-mobans-pkg>=0.1.4
   - cookiecutter:
     - cookiecutter==1.7.0
 test_dependencies:
@@ -36,7 +37,7 @@ test_dependencies:
   - cookiecutter
   - gitfs2
   - pypifs
-  - pypi-mobans-pkg==0.0.15 
+  - pypi-mobans-pkg>=0.1.4
 description: Yet another a project template tool for an organisation.
 python_requires: ">=3.6"
 min_python_version: "3.6"

yehua/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.1.2"
+__version__ = "0.1.3"
 __author__ = "chfw"