release 0.8.0

MANIFEST.in

@@ -1,5 +1,7 @@
 include README.md
 include LICENSE
+include *.txt
 include zvt/samples/data.zip
 include zvt/samples/config.json
-include zvt/accounts/*.json
+include zvt/accounts/*.json
+include zvt/assets/*.css

setup.py

@@ -23,162 +23,42 @@
 # Arguments marked as "Required" below must be included for upload to PyPI.
 # Fields marked as "Optional" may be commented out.
 
-requirements = [str(ir.req) for ir in parse_requirements("requirements.txt", session=False)]
+install_reqs = parse_requirements("requirements.txt", session=False)
 
-setup(
-    # This is the name of your project. The first time you publish this
-    # package, this name will be registered for you. It will determine how
-    # users can install this project, e.g.:
-    #
-    # $ pip install sampleproject
-    #
-    # And where it will live on PyPI: https://pypi.org/project/sampleproject/
-    #
-    # There are some restrictions on what makes a valid project name
-    # specification here:
-    # https://packaging.python.org/specifications/core-metadata/#name
-    name='zvt',  # Required
-
-    # Versions should comply with PEP 440:
-    # https://www.python.org/dev/peps/pep-0440/
-    #
-    # For a discussion on single-sourcing the version across setup.py and the
-    # project code, see
-    # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.7.8',  # Required
-
-    # This is a one-line description or tagline of what your project does. This
-    # corresponds to the "Summary" metadata field:
-    # https://packaging.python.org/specifications/core-metadata/#summary
-    description='unified,modular quantitative system for human beings ',  # Required
-
-    # This is an optional longer description of your project that represents
-    # the body of text which users will see when they visit PyPI.
-    #
-    # Often, this is the same as your README, so you can just read it in from
-    # that file directly (as we have already done above)
-    #
-    # This field corresponds to the "Description" metadata field:
-    # https://packaging.python.org/specifications/core-metadata/#description-optional
-    long_description=long_description,  # Optional
-
-    # This should be a valid link to your project's main homepage.
-    #
-    # This field corresponds to the "Home-Page" metadata field:
-    # https://packaging.python.org/specifications/core-metadata/#home-page-optional
-    url='https://github.com/zvtvz/zvt',  # Optional
-
-    # This should be your name or the name of the organization which owns the
-    # project.
-    author='foolcage',  # Optional
-
-    # This should be a valid email address corresponding to the author listed
-    # above.
-    author_email='[email protected]',  # Optional
+try:
+    requirements = [str(ir.req) for ir in install_reqs]
+except:
+    requirements = [str(ir.requirement) for ir in install_reqs]
 
-    # Classifiers help users find your project by categorizing it.
-    #
-    # For a list of valid classifiers, see
-    # https://pypi.python.org/pypi?%3Aaction=list_classifiers
+setup(
+    name='zvt',
+    version='0.8.0',
+    description='unified,modular quantitative system for human beings ',
+    long_description=long_description,
+    url='https://github.com/zvtvz/zvt',
+    author='foolcage',
+    author_email='[email protected]',
     classifiers=[  # Optional
-        # How mature is this project? Common values are
-        #   3 - Alpha
-        #   4 - Beta
-        #   5 - Production/Stable
         'Development Status :: 5 - Production/Stable',
-
-        # Indicate who your project is intended for
         'Intended Audience :: Developers',
         'Intended Audience :: Customer Service',
         'Intended Audience :: Education',
         'Intended Audience :: Financial and Insurance Industry',
         'Topic :: Software Development :: Build Tools',
         'Topic :: Office/Business :: Financial :: Investment',
-
-        # Pick your license as you wish
         'License :: OSI Approved :: MIT License',
-
-        # Specify the Python versions you support here. In particular, ensure
-        # that you indicate whether you support Python 2, Python 3 or both.
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7'
     ],
 
-    # This field adds keywords for your project which will appear on the
-    # project page. What does your project relate to?
-    #
-    # Note that this is a string of words separated by whitespace, not a list.
-    keywords='ml quant stock finance fintech big-data tushare vnpy zvt technical-analysis trading-platform pandas fundamental-analysis',
-    # Optional
-
-    # You can just specify package directories manually here if your project is
-    # simple. Or you can use find_packages().
-    #
-    # Alternatively, if you just want to distribute a single Python file, use
-    # the `py_modules` argument instead as follows, which will expect a file
-    # called `my_module.py` to exist:
-    #
-    #   py_modules=["my_module"],
-    #
+    keywords='quant stock finance fintech big-data zvt technical-analysis trading-platform pandas fundamental-analysis',
     packages=find_packages(exclude=['examples', 'contrib', 'docs', 'tests', 've', 'research']),  # Required
 
-    # This field lists other packages that your project depends on to run.
-    # Any package you put here will be installed by pip when your project is
-    # installed, so they must be valid existing projects.
-    #
-    # For an analysis of "install_requires" vs pip's requirements files see:
-    # https://packaging.python.org/en/latest/requirements.html
-
-    install_requires=requirements,  # Optional
-
-    # List additional groups of dependencies here (e.g. development
-    # dependencies). Users will be able to install these using the "extras"
-    # syntax, for example:
-    #
-    #   $ pip install sampleproject[dev]
-    #
-    # Similar to `install_requires` above, these must be valid existing
-    # projects.
-    # extras_require={  # Optional
-    #     'dev': ['check-manifest'],
-    #     'test': ['coverage'],
-    # },
-
-    # If there are data files included in your packages that need to be
-    # installed, specify them here.
-    #
-    # If using Python 2.6 or earlier, then these have to be included in
-    # MANIFEST.in as well.
+    install_requires=requirements,
     package_data={
-        'zvt.samples': ['*.zip', '*.json']
+        'zvt.samples': ['*.zip', '*.json'],
+        'zvt.assets': ['*.css']
     },
-
-    # Although 'package_data' is the preferred approach, in some case you may
-    # need to place data files outside of your packages. See:
-    # http://docs.python.org/3.4/distutils/setupscript.html#installing-additional-files
-    #
-    # In this case, 'data_file' will be installed into '<sys.prefix>/my_data'
-    # data_files=[('my_data', ['data/data_file'])],  # Optional
-
-    # To provide executable scripts, use entry points in preference to the
-    # "scripts" keyword. Entry points provide cross-platform support and allow
-    # `pip` to create the appropriate form of executable for the target
-    # platform.
-    #
-    # For example, the following would provide a command called `sample` which
-    # executes the function `main` from this package when invoked:
-
-    # entry_points={  # Optional
-    # },
-
-    # List additional URLs that are relevant to your project as a dict.
-    #
-    # This field corresponds to the "Project-URL" metadata fields:
-    # https://packaging.python.org/specifications/core-metadata/#project-url-multiple-use
-    #
-    # Examples listed include a pattern for specifying where the package tracks
-    # issues, where the source is hosted, where to say thanks to the package
-    # maintainers, and where to support the project financially. The key is
-    # what's used to render the link text on PyPI.
     project_urls={  # Optional
         'Bug Reports': 'https://github.com/zvtvz/zvt/issues',
         'Funding': 'https://www.foolcage.com/zvt',
@@ -188,4 +68,10 @@
 
     include_package_data=True,
     long_description_content_type="text/markdown",
+
+    entry_points={
+        'console_scripts': [
+            'zvt = zvt.main:main',
+        ],
+    },
 )

zvt/main.py

@@ -1,11 +1,44 @@
+import logging
+
 from zvt.app import app
 from zvt.apps.trader_app import serve_layout
 
 app.layout = serve_layout
 
+import pluggy
+
+from zvt import impls, zvt_env, specs
+
+logger = logging.getLogger(__name__)
+
+
+def get_plugin_manager():
+    pm = pluggy.PluginManager("zvt")
+    pm.add_hookspecs(specs)
+    pm.load_setuptools_entrypoints("zvt")
+    pm.register(impls)
+    return pm
+
+
+class ZvtRunner:
+
+    def __init__(self, hook):
+        self.hook = hook
+
+    def run(self):
+        # setup the plugin config
+        self.hook.zvt_setup_env(config=zvt_env)
+
 
 def main():
-    app.run_server(debug=True)
+    try:
+        pm = get_plugin_manager()
+        runner = ZvtRunner(pm.hook)
+        runner.run()
+    except Exception as e:
+        logger.warning(e)
+
+    app.run_server()
 
 
 if __name__ == '__main__':