summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchfw <wangc_2011@hotmail.com>2018-11-06 18:14:24 (GMT)
committerchfw <wangc_2011@hotmail.com>2018-11-06 18:14:24 (GMT)
commit88b2c03899c456f6726649de30d1714ec9545d64 (patch)
tree08c9722994e8bdaa0bd6466c1ec76be323c134e8
parent0ab0a1a50a9ad4554658c6383b17e4f329c82913 (diff)
downloadpython-lml-88b2c03899c456f6726649de30d1714ec9545d64.zip
python-lml-88b2c03899c456f6726649de30d1714ec9545d64.tar.gz
python-lml-88b2c03899c456f6726649de30d1714ec9545d64.tar.bz2
:hammer: code refactoring and :books: update change log
-rw-r--r--.isort.cfg1
-rw-r--r--.moban.yml6
-rw-r--r--CHANGELOG.rst9
-rw-r--r--changelog.yml8
-rw-r--r--docs/source/conf.py27
-rw-r--r--examples/robotchef/robotchef/main.py3
-rw-r--r--examples/v2/robotchef_api/robotchef_api/__init__.py5
-rw-r--r--setup.py2
-rw-r--r--tests/test_plugin_info.py1
-rw-r--r--tests/test_plugin_manager.py3
-rw-r--r--tests/test_utils.py3
11 files changed, 48 insertions, 20 deletions
diff --git a/.isort.cfg b/.isort.cfg
index 2ca38f2..646d29a 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -1,6 +1,7 @@
[settings]
line_length=79
known_first_party=
+known_third_party=mock,nose
indent=' '
multi_line_output=3
length_sort=1
diff --git a/.moban.yml b/.moban.yml
index 5735ebb..a7baa4d 100644
--- a/.moban.yml
+++ b/.moban.yml
@@ -1,6 +1,10 @@
+requires:
+ - type: git
+ url: https://github.com/moremoban/pypi-mobans
+ submodule: true
configuration:
template_dir:
- - "setupmobans/templates"
+ - "pypi-mobans:templates"
- ".moban.d"
configuration: lml.yml
targets:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f15661f..8e954ea 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,15 @@
Change log
================================================================================
+0.0.5 - unreleased
+--------------------------------------------------------------------------------
+
+Fixed
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. `#6 <https://github.com/chfw/lml/issues/6>`_: Catch and Ignore
+ ModuleNotFoundError
+
0.0.4 - 07.08.2018
--------------------------------------------------------------------------------
diff --git a/changelog.yml b/changelog.yml
index 4c3dd17..466f699 100644
--- a/changelog.yml
+++ b/changelog.yml
@@ -2,10 +2,16 @@ name: lml
organisation: chfw
releases:
- changes:
+ - action: Fixed
+ details:
+ - "`#6`: Catch and Ignore ModuleNotFoundError"
+ date: unreleased
+ version: 0.0.5
+- changes:
- action: Added
details:
- "`#4`: to find plugin names with different naming patterns"
- date: 07.08.2018
+ date: 07.08.2018
version: 0.0.4
- changes:
- action: Added
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 87b3e31..9d3ac4c 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -42,12 +42,7 @@ release = u'0.0.4'
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
-extensions = [
- 'sphinx.ext.autodoc',
- 'sphinx.ext.doctest',
- 'sphinx.ext.intersphinx',
- 'sphinx.ext.viewcode',
-]
+extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.viewcode',]
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -74,7 +69,7 @@ language = 'en'
exclude_patterns = []
# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = None
# -- Options for HTML output -------------------------------------------------
@@ -162,6 +157,24 @@ texinfo_documents = [
'Miscellaneous'),
]
+
+# -- Options for Epub output -------------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = project
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#
+# epub_identifier = ''
+
+# A unique identification for the text.
+#
+# epub_uid = ''
+
+# A list of files that should not be packed into the epub file.
+epub_exclude_files = ['search.html']
+
# -- Extension configuration -------------------------------------------------
# -- Options for intersphinx extension ---------------------------------------
diff --git a/examples/robotchef/robotchef/main.py b/examples/robotchef/robotchef/main.py
index c6de9bd..91f5947 100644
--- a/examples/robotchef/robotchef/main.py
+++ b/examples/robotchef/robotchef/main.py
@@ -2,9 +2,10 @@ import sys
import logging
import logging.config
-from lml.loader import scan_plugins
from robotchef.plugin import CuisineManager, NoChefException
+from lml.loader import scan_plugins
+
logging.basicConfig(
format="%(name)s:%(lineno)d - %(levelname)s - %(message)s",
level=logging.DEBUG,
diff --git a/examples/v2/robotchef_api/robotchef_api/__init__.py b/examples/v2/robotchef_api/robotchef_api/__init__.py
index eaa7c53..1d83905 100644
--- a/examples/v2/robotchef_api/robotchef_api/__init__.py
+++ b/examples/v2/robotchef_api/robotchef_api/__init__.py
@@ -1,8 +1,5 @@
from lml.loader import scan_plugins
-from robotchef_api.plugin import ( # noqa: F401
- CuisineManager,
- NoChefException,
-)
+from robotchef_api.plugin import CuisineManager, NoChefException # noqa: F401
BUILTINS = ["robotchef_api.robot_cuisine"]
diff --git a/setup.py b/setup.py
index ef65f2f..997e3ad 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ URL = 'https://github.com/chfw/lml'
DOWNLOAD_URL = '%s/archive/0.0.4.tar.gz' % URL
FILES = ['README.rst', 'CHANGELOG.rst']
KEYWORDS = [
- 'python'
+ 'python',
]
CLASSIFIERS = [
diff --git a/tests/test_plugin_info.py b/tests/test_plugin_info.py
index 7a820f2..c81f4c7 100644
--- a/tests/test_plugin_info.py
+++ b/tests/test_plugin_info.py
@@ -1,7 +1,6 @@
import json
from lml.plugin import PluginInfo
-
from nose.tools import eq_
diff --git a/tests/test_plugin_manager.py b/tests/test_plugin_manager.py
index 2c0a86d..5b447c6 100644
--- a/tests/test_plugin_manager.py
+++ b/tests/test_plugin_manager.py
@@ -1,3 +1,4 @@
+from mock import patch
from lml.plugin import (
PLUG_IN_MANAGERS,
CACHED_PLUGIN_INFO,
@@ -5,8 +6,6 @@ from lml.plugin import (
PluginManager,
_show_me_your_name,
)
-
-from mock import patch
from nose.tools import eq_, raises
diff --git a/tests/test_utils.py b/tests/test_utils.py
index d79adfe..e64211a 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,7 +1,6 @@
+from mock import patch
from lml.utils import do_import, json_dumps
from lml.plugin import PluginManager
-
-from mock import patch
from nose.tools import eq_