🥚 🎡 release 0.0.4

chfw · chfw · commit 6ee766f452ad · 2020-10-17T22:11:43.000+01:00
diff --git a/.github/workflows/moban-update.yml b/.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
diff --git a/.gitignore b/.gitignore
@@ -540,3 +540,7 @@ cscope.files
 cscope.out
 cscope.in.out
 cscope.po.out
+
+
+# remove moban hash dictionary
+.moban.hashes
diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,7 @@ stages:
   env:
     - MINREQ=0
   stage: moban
-  install: pip install moban>=0.0.4 gitfs2 pypifs moban-jinja2-github
+  install: pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible
   script:
     - moban
     - git diff --exit-code
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,13 @@
 Change log
 ================================================================================
 
+0.0.4 - 17.10.2020
+--------------------------------------------------------------------------------
+
+**added**
+
+#. exclude a list of user names instead of a single user name
+
 0.0.3 - 02.09.2020
 --------------------------------------------------------------------------------
 
diff --git a/LICENSE b/LICENSE
@@ -13,7 +13,7 @@ that the following conditions are met:
   and/or other materials provided with the distribution.
 
 * Neither the name of 'moban-jinja2-github' nor the names of the contributors
-  may be used to endorse or promote products derived from this software
+  may not be used to endorse or promote products derived from this software
   without specific prior written permission.
 
 THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
diff --git a/Makefile b/Makefile
@@ -6,9 +6,6 @@ test: lint
 install_test:
 	pip install -r tests/requirements.txt
 
-git-diff-check:
-	git diff --exit-code
-
 lint:
 	bash lint.sh
 
diff --git a/README.rst b/README.rst
@@ -16,6 +16,12 @@ moban-jinja2-github
 .. image:: https://img.shields.io/github/stars/moremoban/moban-jinja2-github.svg?style=social&maxAge=3600&label=Star
     :target: https://github.com/moremoban/moban-jinja2-github/stargazers
 
+.. image:: https://img.shields.io/static/v1?label=continuous%20templating&message=%E6%A8%A1%E7%89%88%E6%9B%B4%E6%96%B0&color=blue&style=flat-square
+    :target: https://moban.readthedocs.io/en/latest/#at-scale-continous-templating-for-open-source-projects
+
+.. image:: https://img.shields.io/static/v1?label=coding%20style&message=black&color=black&style=flat-square
+    :target: https://github.com/psf/black
+
 .. image:: https://dev.azure.com/moremoban/moban-jinja2-github/_apis/build/status/moremoban.moban-jinja2-github?branchName=master
    :target: https://dev.azure.com/moremoban/moban-jinja2-github/_build/latest?definitionId=2&branchName=master
 
diff --git a/changelog.yml b/changelog.yml
@@ -1,6 +1,12 @@
 name: moban-jinja2-github
 organisation: moremoban
 releases:
+- changes:
+  - action: added
+    details:
+    - exclude a list of user names instead of a single user name
+  version: 0.0.4
+  date: 17.10.2020
 - changes:
   - action: added
     details:
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -20,9 +20,9 @@
 copyright = ''
 author = 'chfw'
 # The short X.Y version
-version = '0.0.3'
+version = '0.0.4'
 # The full version, including alpha/beta/rc tags
-release = '0.0.3'
+release = '0.0.4'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/lint.sh b/lint.sh
@@ -1,3 +1,2 @@
 pip install flake8
-flake8 . --exclude=.moban.d,docs,setup.py --builtins=unicode,xrange,long
-python setup.py checkdocs
+flake8 --exclude=.moban.d,docs,setup.py   --builtins=unicode,xrange,long .  && python setup.py checkdocs
diff --git a/moban-jinja2-github.yml b/moban-jinja2-github.yml
@@ -3,9 +3,9 @@ organisation: "moremoban"
 author: "chfw"
 contact: "info@moremoban.org"
 company: "C.W."
-version: "0.0.3"
-current_version: "0.0.3"
-release: "0.0.3"
+version: "0.0.4"
+current_version: "0.0.4"
+release: "0.0.4"
 copyright_year: 2020
 license: newbsd
 dependencies: 
diff --git a/moban_jinja2_github/_version.py b/moban_jinja2_github/_version.py
@@ -1,2 +1,2 @@
-__version__ = "0.0.3"
+__version__ = "0.0.4"
 __author__ = "chfw"
diff --git a/moban_jinja2_github/contributors.py b/moban_jinja2_github/contributors.py
@@ -2,13 +2,15 @@
 from gease.contributors import EndPoint
 
 
-def get_contributors(user, repo, author):
+def get_contributors(user, repo, exclude_contributors=()):
     repo = EndPoint(user, repo)
     try:
         user_list = repo.get_all_contributors()
 
         user_list = [
-            detail for detail in user_list if author not in detail["url"]
+            detail
+            for detail in user_list
+            if "name" in detail and detail["name"] not in exclude_contributors
         ]
         return user_list
     except UrlNotFound:
diff --git a/setup.py b/setup.py
@@ -32,14 +32,14 @@
 
 NAME = "moban-jinja2-github"
 AUTHOR = "chfw"
-VERSION = "0.0.3"
+VERSION = "0.0.4"
 EMAIL = "info@moremoban.org"
 LICENSE = "newbsd"
 DESCRIPTION = (
     "Github specific filters, tests and globals"
 )
 URL = "https://github.com/moremoban/moban-jinja2-github"
-DOWNLOAD_URL = "%s/archive/0.0.3.tar.gz" % URL
+DOWNLOAD_URL = "%s/archive/0.0.4.tar.gz" % URL
 FILES = ["README.rst", "CHANGELOG.rst"]
 KEYWORDS = [
     "python",
@@ -71,13 +71,14 @@
 }
 # 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 moban-jinja2-github v0.0.3 " +
-              "Find 0.0.3 in changelog for more details")
+HERE = os.path.abspath(os.path.dirname(__file__))
+
+GS_COMMAND = ("gs moban-jinja2-github v0.0.4 " +
+              "Find 0.0.4 in changelog for more details")
 NO_GS_MESSAGE = ("Automatic github release is disabled. " +
                  "Please install gease to enable it.")
 UPLOAD_FAILED_MSG = (
     'Upload failed. please run "%s" yourself.' % PUBLISH_COMMAND)
-HERE = os.path.abspath(os.path.dirname(__file__))
 
 
 class PublishCommand(Command):
@@ -123,7 +124,6 @@ def run(self):
     "publish": PublishCommand
 })
 
-
 def has_gease():
     """
     test if github release command is installed
diff --git a/tests/test_contributors.py b/tests/test_contributors.py
@@ -5,16 +5,19 @@
 
 @patch("moban_jinja2_github.contributors.EndPoint")
 def test_get_contributors(fake_end_point):
-    sample_contributors = [{"url": "author"}, {"url": "contributors"}]
+    sample_contributors = [
+        {"name": "author"},
+        {"name": "ok", "url": "contributors"},
+    ]
     fake_api = MagicMock(
         get_all_contributors=MagicMock(return_value=sample_contributors)
     )
     fake_end_point.return_value = fake_api
 
     from moban_jinja2_github.contributors import get_contributors
 
-    actual = get_contributors("user", "repo", "author")
-    expected = [{"url": "contributors"}]
+    actual = get_contributors("user", "repo", ["author"])
+    expected = [{"name": "ok", "url": "contributors"}]
 
     eq_(list(actual), expected)
 
@@ -28,7 +31,7 @@ def test_get_non_existent_url(fake_end_point):
 
     from moban_jinja2_github.contributors import get_contributors
 
-    actual = get_contributors("user", "repo", "author")
+    actual = get_contributors("user", "repo", ["author"])
     expected = []
 
     eq_(list(actual), expected)
