diff --git a/.moban.d/custom_setup.py.jj2 b/.moban.d/custom_setup.py.jj2 index 09ed8dd..cb1d177 100644 --- a/.moban.d/custom_setup.py.jj2 +++ b/.moban.d/custom_setup.py.jj2 @@ -4,10 +4,11 @@ try: from pyecharts_jupyter_installer import install_cmd_for except ImportError: - import pip + import subprocess import importlib - pip.main(['install', 'pyecharts-jupyter-installer']) + subprocess.check_call([sys.executable, '-m', + 'pip', 'install', 'pyecharts-jupyter-installer']) install_cmd_for = importlib.import_module( 'pyecharts_jupyter_installer').install_cmd_for {% endblock %} diff --git a/.moban.yml b/.moban.yml index 4c3c29e..9d84967 100644 --- a/.moban.yml +++ b/.moban.yml @@ -13,3 +13,6 @@ targets: - "echarts_china_provinces_pypkg/_version.py": "_version.py.jj2" - .gitignore: gitignore.jj2 - .travis.yml: travis.yml.jj2 + - output: CHANGELOG.rst + configuration: changelog.yml + template: CHANGELOG.rst.jj2 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7398c8c..47bce8f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,2 +1,19 @@ Change log -=========== +================================================================================ + +0.0.2 - 26.04.2018 +-------------------------------------------------------------------------------- + +Updated +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +#. `pyecharts#492 `_: pip 10 + compactibility problem + +0.0.1 - 22.02.2018 +-------------------------------------------------------------------------------- + +Added +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +#. first stable release diff --git a/changelog.yml b/changelog.yml new file mode 100644 index 0000000..c09d144 --- /dev/null +++ b/changelog.yml @@ -0,0 +1,15 @@ +name: echarts-china-provinces-pypkg +organisation: pyecharts +releases: +- changes: + - action: Updated + details: + - "`pyecharts#492`: pip 10 compactibility problem" + date: 26.04.2018 + version: 0.0.2 +- changes: + - action: Added + details: + - first stable release + date: 22.02.2018 + version: 0.0.1 diff --git a/docs/source/conf.py b/docs/source/conf.py index 5604de3..92bfa1b 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -16,8 +16,8 @@ project = u'echarts-china-provinces-pypkg' copyright = u'2018 pyecharts dev team' -version = '0.0.1' -release = '0.0.1' +version = '0.0.2' +release = '0.0.2' exclude_patterns = [] pygments_style = 'sphinx' html_theme = 'default' diff --git a/echarts-china-provinces-pypkg.yml b/echarts-china-provinces-pypkg.yml index 14678a0..6d2194f 100644 --- a/echarts-china-provinces-pypkg.yml +++ b/echarts-china-provinces-pypkg.yml @@ -3,9 +3,9 @@ organisation: "chfw" author: "C.W." contact: "wangc_2011@hotmail.com" company: "pyecharts dev team" -version: "0.0.1" -current_version: "0.0.1" -release: "0.0.1" +version: "0.0.2" +current_version: "0.0.2" +release: "0.0.2" copyright_year: 2018 license: MIT nowheel: true diff --git a/echarts_china_provinces_pypkg/_version.py b/echarts_china_provinces_pypkg/_version.py index 4189e9d..ca9f201 100644 --- a/echarts_china_provinces_pypkg/_version.py +++ b/echarts_china_provinces_pypkg/_version.py @@ -1,2 +1,2 @@ -__version__ = '0.0.1' +__version__ = '0.0.2' __author__ = 'C.W.' diff --git a/setup.py b/setup.py index 61bcdee..8a43ac8 100644 --- a/setup.py +++ b/setup.py @@ -7,10 +7,11 @@ try: from pyecharts_jupyter_installer import install_cmd_for except ImportError: - import pip + import subprocess import importlib - pip.main(['install', 'pyecharts-jupyter-installer']) + subprocess.check_call([sys.executable, '-m', + 'pip', 'install', 'pyecharts-jupyter-installer']) install_cmd_for = importlib.import_module( 'pyecharts_jupyter_installer').install_cmd_for PY2 = sys.version_info[0] == 2 @@ -18,14 +19,14 @@ NAME = 'echarts-china-provinces-pypkg' AUTHOR = 'C.W.' -VERSION = '0.0.1' +VERSION = '0.0.2' EMAIL = 'wangc_2011@hotmail.com' LICENSE = 'MIT' DESCRIPTION = ( 'Python package for chinese provinces for pyecharts' ) URL = 'https://github.com/chfw/echarts-china-provinces-pypkg' -DOWNLOAD_URL = '%s/archive/0.0.1.tar.gz' % URL +DOWNLOAD_URL = '%s/archive/0.0.2.tar.gz' % URL FILES = ['README.rst', 'CHANGELOG.rst'] KEYWORDS = [ 'python' @@ -59,8 +60,8 @@ # You do not need to read beyond this line PUBLISH_COMMAND = '{0} setup.py sdist upload -r pypi'.format( sys.executable) -GS_COMMAND = ('gs echarts-china-provinces-pypkg v0.0.1 ' + - "Find 0.0.1 in changelog for more details") +GS_COMMAND = ('gs echarts-china-provinces-pypkg v0.0.2 ' + + "Find 0.0.2 in changelog for more details") NO_GS_MESSAGE = ('Automatic github release is disabled. ' + 'Please install gease to enable it.') UPLOAD_FAILED_MSG = (