From fff65aa812da7dc98edd0ded8ae0ca7b69e974e7 Mon Sep 17 00:00:00 2001 From: chfw Date: Tue, 10 Sep 2019 20:13:58 +0100 Subject: [PATCH 1/2] :bug: fix broken git repo support where gitfs2 is not installed --- .moban.cd/changelog.yml | 6 ++++++ .moban.cd/moban.yml | 8 +++++--- CHANGELOG.rst | 9 +++++++++ docs/conf.py | 4 ++-- min_requirements.txt | 2 ++ moban/_version.py | 2 +- requirements.txt | 2 ++ setup.py | 10 ++++++---- 8 files changed, 33 insertions(+), 10 deletions(-) diff --git a/.moban.cd/changelog.yml b/.moban.cd/changelog.yml index 220de36d..91db33ca 100644 --- a/.moban.cd/changelog.yml +++ b/.moban.cd/changelog.yml @@ -1,6 +1,12 @@ name: moban organisation: moremoban releases: + - changes: + - action: Added + details: + - "`#328`: update backward compatibility" + date: 10.09.2019 + version: 0.6.1 - changes: - action: Added details: diff --git a/.moban.cd/moban.yml b/.moban.cd/moban.yml index 26bbdbc5..2773600a 100644 --- a/.moban.cd/moban.yml +++ b/.moban.cd/moban.yml @@ -4,9 +4,9 @@ organisation: moremoban author: C. W. contact: wangc_2011@hotmail.com license: MIT -version: 0.6.0 -current_version: 0.6.0 -release: 0.6.0 +version: 0.6.1 +current_version: 0.6.1 +release: 0.6.1 branch: master master: index command_line_interface: "moban" @@ -27,6 +27,8 @@ dependencies: - appdirs>=1.4.3 - crayons>= 0.1.0 - fs>=2.4.11 + - GitPython>=2.0.0 + - git-url-parse>=1.2.2 - jinja2-fsloader>=0.2.0 description: Yet another jinja2 cli command for static text generation scm_host: github.com diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 11bc1140..52be1511 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,15 @@ Change log ================================================================================ +0.6.1 - 10.09.2019 +-------------------------------------------------------------------------------- + +Added +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +#. `#328 `_: update backward + compatibility + 0.6.0 - 10.09.2019 -------------------------------------------------------------------------------- diff --git a/docs/conf.py b/docs/conf.py index 211c3008..21913442 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -25,9 +25,9 @@ copyright = '2017-2019 Onni Software Ltd.' author = 'C. W.' # The short X.Y version -version = '0.6.0' +version = '0.6.1' # The full version, including alpha/beta/rc tags -release = '0.6.0' +release = '0.6.1' # -- General configuration --------------------------------------------------- diff --git a/min_requirements.txt b/min_requirements.txt index c3cac050..fcb9fc23 100644 --- a/min_requirements.txt +++ b/min_requirements.txt @@ -7,4 +7,6 @@ lml==0.0.9 appdirs==1.4.3 crayons== 0.1.0 fs==2.4.11 +GitPython==2.0.0 +git-url-parse==1.2.2 jinja2-fsloader==0.2.0 diff --git a/moban/_version.py b/moban/_version.py index 6197ada2..6f26cf69 100644 --- a/moban/_version.py +++ b/moban/_version.py @@ -1,2 +1,2 @@ -__version__ = "0.6.0" +__version__ = "0.6.1" __author__ = "C. W." diff --git a/requirements.txt b/requirements.txt index 8ad69281..d2f77b3b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,6 @@ lml>=0.0.9 appdirs>=1.4.3 crayons>= 0.1.0 fs>=2.4.11 +GitPython>=2.0.0 +git-url-parse>=1.2.2 jinja2-fsloader>=0.2.0 diff --git a/setup.py b/setup.py index 0c6abfaf..dd725544 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ NAME = "moban" AUTHOR = "C. W." -VERSION = "0.6.0" +VERSION = "0.6.1" EMAIL = "wangc_2011@hotmail.com" LICENSE = "MIT" ENTRY_POINTS = { @@ -50,7 +50,7 @@ "Yet another jinja2 cli command for static text generation" ) URL = "https://github.com/moremoban/moban" -DOWNLOAD_URL = "%s/archive/0.6.0.tar.gz" % URL +DOWNLOAD_URL = "%s/archive/0.6.1.tar.gz" % URL FILES = ["README.rst", "CONTRIBUTORS.rst", "CHANGELOG.rst"] KEYWORDS = [ "python", @@ -81,6 +81,8 @@ "appdirs>=1.4.3", "crayons>= 0.1.0", "fs>=2.4.11", + "GitPython>=2.0.0", + "git-url-parse>=1.2.2", "jinja2-fsloader>=0.2.0", ] SETUP_COMMANDS = {} @@ -95,8 +97,8 @@ } # 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 v0.6.0 " + - "Find 0.6.0 in changelog for more details") +GS_COMMAND = ("gs moban v0.6.1 " + + "Find 0.6.1 in changelog for more details") NO_GS_MESSAGE = ("Automatic github release is disabled. " + "Please install gease to enable it.") UPLOAD_FAILED_MSG = ( From 0c073aa66578fc19f1efb52f7f2c015eade3d1d4 Mon Sep 17 00:00:00 2001 From: chfw Date: Tue, 10 Sep 2019 20:24:31 +0100 Subject: [PATCH 2/2] :sparkles: really to be backward compactible, it is to have pypifs and gitfs2 installed --- .moban.cd/moban.yml | 4 ++-- min_requirements.txt | 4 ++-- requirements.txt | 4 ++-- setup.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.moban.cd/moban.yml b/.moban.cd/moban.yml index 2773600a..b92eef9d 100644 --- a/.moban.cd/moban.yml +++ b/.moban.cd/moban.yml @@ -27,8 +27,8 @@ dependencies: - appdirs>=1.4.3 - crayons>= 0.1.0 - fs>=2.4.11 - - GitPython>=2.0.0 - - git-url-parse>=1.2.2 + - gitfs2>=0.0.1 + - pypifs>=0.0.1 - jinja2-fsloader>=0.2.0 description: Yet another jinja2 cli command for static text generation scm_host: github.com diff --git a/min_requirements.txt b/min_requirements.txt index fcb9fc23..8275da87 100644 --- a/min_requirements.txt +++ b/min_requirements.txt @@ -7,6 +7,6 @@ lml==0.0.9 appdirs==1.4.3 crayons== 0.1.0 fs==2.4.11 -GitPython==2.0.0 -git-url-parse==1.2.2 +gitfs2==0.0.1 +pypifs==0.0.1 jinja2-fsloader==0.2.0 diff --git a/requirements.txt b/requirements.txt index d2f77b3b..45aaaec7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,6 @@ lml>=0.0.9 appdirs>=1.4.3 crayons>= 0.1.0 fs>=2.4.11 -GitPython>=2.0.0 -git-url-parse>=1.2.2 +gitfs2>=0.0.1 +pypifs>=0.0.1 jinja2-fsloader>=0.2.0 diff --git a/setup.py b/setup.py index dd725544..dcbae103 100644 --- a/setup.py +++ b/setup.py @@ -81,8 +81,8 @@ "appdirs>=1.4.3", "crayons>= 0.1.0", "fs>=2.4.11", - "GitPython>=2.0.0", - "git-url-parse>=1.2.2", + "gitfs2>=0.0.1", + "pypifs>=0.0.1", "jinja2-fsloader>=0.2.0", ] SETUP_COMMANDS = {}