Merge pull request #380 from moremoban/dev

chfw · web-flow · commit 53ea91ad595b · 2020-05-14T00:07:54.000+01:00
release 0.7.4
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.6, 3.7]
+        python-version: [3.6, 3.7, 3.8]
 
     steps:
       - uses: actions/checkout@v1
diff --git a/.gitignore b/.gitignore
@@ -25,7 +25,6 @@ parts/
 sdist/
 var/
 wheels/
-pip-wheel-metadata/
 share/python-wheels/
 *.egg-info/
 .installed.cfg
@@ -143,10 +142,6 @@ dmypy.json
 # Cython debug symbols
 cython_debug/
 
-# static files generated from Django application using `collectstatic`
-media
-static
-
 # VirtualEnv rules
 # Virtualenv
 # http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
@@ -431,6 +426,9 @@ tmtags
 !.vscode/extensions.json
 *.code-workspace
 
+# Local History for Visual Studio Code
+.history/
+
 # Xcode rules
 # Xcode
 #
diff --git a/.moban.cd/changelog.yml b/.moban.cd/changelog.yml
@@ -1,6 +1,13 @@
 name: moban
 organisation: moremoban
 releases:
+  - changes:
+      - action: Fixed
+        details:
+          - "`#378`: suppress stdout message from deprecated pip install.
+	    but please do not use and migrate deprecated`requires` syntax."
+    date: 13.5.2020
+    version: 0.7.4
   - changes:
       - action: Added
         details:
diff --git 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.7.3
-current_version: 0.7.3
-release: 0.7.3
+version: 0.7.4
+current_version: 0.7.4
+release: 0.7.4
 branch: master
 master: index
 command_line_interface: "moban"
@@ -18,7 +18,6 @@ keywords:
   - jinja2
   - moban
 dependencies:
-  - ruamel.yaml>=0.15.5,<=0.15.94;python_version == '3.4'
   - ruamel.yaml>=0.15.42;python_version == '3.7'
   - ruamel.yaml>=0.15.5;python_version != '3.4' and python_version < '3.7'
   - ruamel.yaml>=0.15.98;python_version == '3.8'
@@ -35,3 +34,4 @@ moban_command: make update git-diff-check
 setup_use_markers: true
 setup_use_markers_fix: true
 python_requires: ">=3.6"
+min_python_version: "3.6"
diff --git a/.moban.d/moban_travis.yml.jj2 b/.moban.d/moban_travis.yml.jj2
@@ -2,7 +2,6 @@
 
 {%block extra_matrix %}
 env:
-  - MINREQ=0
   - MINREQ=1
 {%endblock%}
 
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,6 @@ python:
   - 3.6
   - 3.8
 env:
-  - MINREQ=0
   - MINREQ=1
 
 stages:
@@ -21,11 +20,15 @@ stages:
   git:
     submodules: false
   python: 3.6
+  env:
+    - MINREQ=0
   stage: lint
   script: make install_test format git-diff-check lint
 
 .moban: &moban
   python: 3.6
+  env:
+    - MINREQ=0
   stage: moban
   install: pip install moban>=0.0.4 gitfs2 pypifs
   script: make update git-diff-check
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,15 @@
 Change log
 ================================================================================
 
+0.7.4 - 13.5.2020
+--------------------------------------------------------------------------------
+
+**Fixed**
+
+#. `#378 <https://github.com/moremoban/moban/issues/378>`_: suppress stdout
+   message from deprecated pip install. but please do not use and migrate
+   deprecated`requires` syntax.
+
 0.7.3 - 2.5.2020
 --------------------------------------------------------------------------------
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -25,9 +25,9 @@
 copyright = '2017-2020 Onni Software Ltd.'
 author = 'C. W.'
 # The short X.Y version
-version = '0.7.3'
+version = '0.7.4'
 # The full version, including alpha/beta/rc tags
-release = '0.7.3'
+release = '0.7.4'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/min_requirements.txt b/min_requirements.txt
@@ -1,4 +1,3 @@
-ruamel.yaml==0.15.5;python_version == '3.4'
 ruamel.yaml==0.15.42;python_version == '3.7'
 ruamel.yaml==0.15.5;python_version != '3.4' and python_version < '3.7'
 ruamel.yaml==0.15.98;python_version == '3.8'
diff --git a/moban/_version.py b/moban/_version.py
@@ -1,2 +1,2 @@
-__version__ = "0.7.3"
+__version__ = "0.7.4"
 __author__ = "C. W."
diff --git a/moban/core/moban_factory.py b/moban/core/moban_factory.py
@@ -49,8 +49,8 @@ def get_engine(self, template_type, template_dirs, context_dirs):
         template_dirs = utils.verify_the_existence_of_directories(
             template_dirs
         )
-
         if template_type in self.options_registry:
+
             custom_engine_spec = self.options_registry[template_type]
             engine_cls = self.load_me_now(
                 custom_engine_spec[constants.TEMPLATE_TYPES_BASE_TYPE]
diff --git a/moban/deprecated/__init__.py b/moban/deprecated/__init__.py
@@ -65,7 +65,9 @@ def pip_install(packages):
     import subprocess
 
     subprocess.check_call(
-        [sys.executable, "-m", "pip", "install", " ".join(packages)]
+        [sys.executable, "-m", "pip", "install", " ".join(packages)],
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL,
     )
 
 
diff --git a/moban/externals/reporter.py b/moban/externals/reporter.py
@@ -17,7 +17,7 @@
 def report_templating(
     action_in_present_continuous_tense, source_file, destination_file
 ):
-    print(
+    do_print(
         MESSAGE_TEMPLATING.format(
             action_in_present_continuous_tense,
             crayons.yellow(source_file),
@@ -27,36 +27,36 @@ def report_templating(
 
 
 def report_no_action():
-    print(crayons.yellow(MESSAGE_NO_TEMPLATING, bold=True))
+    do_print(crayons.yellow(MESSAGE_NO_TEMPLATING, bold=True))
 
 
 def report_full_run(action_in_past_tense, file_count):
     figure = crayons.green(str(file_count), bold=True)
     message = MESSAGE_TEMPLATED_ALL.format(action_in_past_tense, figure)
-    print(_format_single(message, file_count))
+    do_print(_format_single(message, file_count))
 
 
 def report_partial_run(action_in_past_tense, file_count, total):
     figure = crayons.green(str(file_count), bold=True)
     total_figure = crayons.yellow(str(total), bold=True)
     message = MESSAGE_REPORT.format(action_in_past_tense, figure, total_figure)
-    print(_format_single(message, total))
+    do_print(_format_single(message, total))
 
 
 def report_error_message(message):
-    print(crayons.white("Error: ", bold=True) + crayons.red(message))
+    do_print(crayons.white("Error: ", bold=True) + crayons.red(message))
 
 
 def report_warning_message(message):
-    print(crayons.white("Warning: ", bold=True) + crayons.yellow(message))
+    do_print(crayons.white("Warning: ", bold=True) + crayons.yellow(message))
 
 
 def report_info_message(message):
-    print(crayons.white("Info: ") + crayons.green(message))
+    do_print(crayons.white("Info: ") + crayons.green(message))
 
 
 def report_up_to_date():
-    print(crayons.green(MESSAGE_UP_TO_DATE, bold=True))
+    do_print(crayons.green(MESSAGE_UP_TO_DATE, bold=True))
 
 
 def convert_to_shell_exit_code(number_of_templated_files):
@@ -69,12 +69,12 @@ def convert_to_shell_exit_code(number_of_templated_files):
 
 def report_git_pull(repo):
     colored_repo = crayons.green(repo, bold=True)
-    print(MESSAGE_PULLING_REPO.format(colored_repo))
+    do_print(MESSAGE_PULLING_REPO.format(colored_repo))
 
 
 def report_git_clone(repo):
     colored_repo = crayons.green(repo, bold=True)
-    print(MESSAGE_CLONING_REPO.format(colored_repo))
+    do_print(MESSAGE_CLONING_REPO.format(colored_repo))
 
 
 def report_template_not_in_moban_file(template):
@@ -90,3 +90,7 @@ def _format_single(message, count):
 
 def report_file_extension_not_needed():
     report_info_message(MESSAGE_FILE_EXTENSION_NOT_NEEDED)
+
+
+def do_print(message):
+    print(message)
diff --git a/moban/plugins/jinja2/engine.py b/moban/plugins/jinja2/engine.py
@@ -86,6 +86,7 @@ def __init__(self, template_fs, options=None):
             ],  # get a copy of this global variable
         )
         self.template_loader = template_loader
+
         if options:
             if "extensions" in options:
                 extensions = options.pop("extensions")
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
-ruamel.yaml>=0.15.5,<=0.15.94;python_version == '3.4'
 ruamel.yaml>=0.15.42;python_version == '3.7'
 ruamel.yaml>=0.15.5;python_version != '3.4' and python_version < '3.7'
 ruamel.yaml>=0.15.98;python_version == '3.8'
diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@
 
 NAME = "moban"
 AUTHOR = "C. W."
-VERSION = "0.7.3"
+VERSION = "0.7.4"
 EMAIL = "wangc_2011@hotmail.com"
 LICENSE = "MIT"
 ENTRY_POINTS = {
@@ -53,7 +53,7 @@
     "General purpose static text generator"
 )
 URL = "https://github.com/moremoban/moban"
-DOWNLOAD_URL = "%s/archive/0.7.3.tar.gz" % URL
+DOWNLOAD_URL = "%s/archive/0.7.4.tar.gz" % URL
 FILES = ["README.rst", "CONTRIBUTORS.rst", "CHANGELOG.rst"]
 KEYWORDS = [
     "python",
@@ -65,11 +65,11 @@
     "Topic :: Software Development :: Libraries",
     "Programming Language :: Python",
     "Intended Audience :: Developers",
-    "Programming Language :: Python :: 2.6",
-    "Programming Language :: Python :: 2.7",
-    "Programming Language :: Python :: 3.3",
-    "Programming Language :: Python :: 3.4",
-    "Programming Language :: Python :: 3.5",
+
+    "Programming Language :: Python :: 3 :: Only",
+
+
+
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
@@ -90,15 +90,14 @@
 
 PACKAGES = find_packages(exclude=["ez_setup", "examples", "tests", "tests.*"])
 EXTRAS_REQUIRE = {
-    ":python_version == '3.4'": ["ruamel.yaml>=0.15.5,<=0.15.94"],
     ":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 moban v0.7.3 " +
-              "Find 0.7.3 in changelog for more details")
+GS_COMMAND = ("gs moban v0.7.4 " +
+              "Find 0.7.4 in changelog for more details")
 NO_GS_MESSAGE = ("Automatic github release is disabled. " +
                  "Please install gease to enable it.")
 UPLOAD_FAILED_MSG = (
diff --git a/tests/fixtures/.moban-2.yml b/tests/fixtures/.moban-2.yml
@@ -1,5 +1,5 @@
 requires:
-  - pypi-mobans-pkg
+  - pypi-mobans-pkg==0.0.12
 configuration:
   configuration_dir: "setupmobans:config"
   template_dir:
diff --git a/tests/integration_tests/test_command_line_options.py b/tests/integration_tests/test_command_line_options.py
@@ -449,9 +449,9 @@ def test_version_option():
 
 
 @patch("logging.basicConfig")
-def test_debug_option(fake_config):
+def test_warning_verbose(fake_config):
     fake_config.side_effect = [IOError("stop test")]
-    test_args = ["moban", "-vv"]
+    test_args = ["moban", "-vvv"]
     with patch.object(sys, "argv", test_args):
         from moban.main import main
 
@@ -460,7 +460,7 @@ def test_debug_option(fake_config):
         except IOError:
             fake_config.assert_called_with(
                 format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-                level=20,
+                level=10,
             )
 
 
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -7,7 +7,7 @@ flake8
 black;python_version>="3.6"
 isort;python_version>="3.6"
 moban-handlebars
-pypi-mobans-pkg
+pypi-mobans-pkg==0.0.12
 # arrow 0.14.0 doesnt support Python 3.4
 arrow<0.14.0;python_version=="3.4"
 arrow;python_version!="3.4"
diff --git a/tests/test_file_system.py b/tests/test_file_system.py
@@ -272,5 +272,7 @@ def test_pip_install(fake_check_all):
 
     pip_install(["package1", "package2"])
     fake_check_all.assert_called_with(
-        [sys.executable, "-m", "pip", "install", "package1 package2"]
+        [sys.executable, "-m", "pip", "install", "package1 package2"],
+        stderr=-3,
+        stdout=-3,
     )

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-ruamel.yaml==0.15.5;python_version == '3.4'`
`2`	`1`	`ruamel.yaml==0.15.42;python_version == '3.7'`
`3`	`2`	`ruamel.yaml==0.15.5;python_version != '3.4' and python_version < '3.7'`
`4`	`3`	`ruamel.yaml==0.15.98;python_version == '3.8'`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-__version__ = "0.7.3"`
	`1`	`+__version__ = "0.7.4"`
`2`	`2`	`__author__ = "C. W."`