'Fix: 修复 "example" -> "examples" && "test" -> "tests"' (#7)

.gitignore

@@ -100,5 +100,5 @@ ENV/
 .mypy_cache/
 
 # custom
-example/*.html
-test/*.html
+examples/*.html
+tests/*.html

.travis.yml

@@ -10,9 +10,9 @@ python:
   - "3.7-dev"
   - "3.6"
 before_install:
-  - pip install -r test/requirements.txt
+  - pip install -r tests/requirements.txt
 script:
   - python setup.py install
   - bash test.sh
 after_success:
-  cd test && codecov
+  cd tests && codecov

README.md

@@ -112,7 +112,7 @@ chart.load_javascript()
 
 ## 🔖 Demo
 
-> Demo 代码位于 example 文件夹下。
+> Demo 代码位于 examples 文件夹下。
 
 <div align="center">
     <img src="https://user-images.githubusercontent.com/19553554/66558121-9f760380-eb85-11e9-8b37-6d4dbd39f2e8.png" width="33%"/>
@@ -128,7 +128,7 @@ chart.load_javascript()
 ### 单元测试
 
 ```shell
-$ pip install -r test/requirements.txt
+$ pip install -r tests/requirements.txt
 $ test
 ```
 

appveyor.yml

@@ -8,9 +8,9 @@ environment:
 
 install:
   - "%PYTHON%\\python.exe -m pip install -r requirements.txt"
-  - cd test
+  - cd tests
   - "%PYTHON%\\python.exe -m pip install -r requirements.txt"
 build: off
 
 test_script:
-  - "%PYTHON%/Scripts/nosetests --with-coverage --cover-package cutecharts --cover-package test && cd .. && %PYTHON%/Scripts/flake8 --exclude build --max-line-length 89 --ignore=F401"
+  - "%PYTHON%/Scripts/nosetests --with-coverage --cover-package cutecharts --cover-package tests && cd .. && %PYTHON%/Scripts/flake8 --exclude build --max-line-length 89 --ignore=F401"

examples/example_page.py

@@ -0,0 +1,10 @@
+from cutecharts.components import Page
+from examples.example_bar import bar_base
+from examples.example_line import line_base
+from examples.example_pie import pie_base
+from examples.example_radar import radar_base
+from examples.example_scatter import scatter_base
+
+page = Page()
+page.add(bar_base(), line_base(), pie_base(), radar_base(), scatter_base())
+page.render()

example/example_radar.py → examples/example_radar.py

@@ -1,27 +1,27 @@
-from cutecharts.charts import Radar
-from cutecharts.components import Page
-from cutecharts.faker import Faker
-
-
-def radar_base() -> Radar:
-    chart = Radar("Radar-基本示例")
-    chart.set_options(labels=Faker.choose())
-    chart.add_series("series-A", Faker.values())
-    chart.add_series("series-B", Faker.values())
-    return chart
-
-
-radar_base().render()
-
-
-def radar_legend_colors():
-    chart = Radar("Radar-颜色调整")
-    chart.set_options(labels=Faker.choose(), colors=Faker.colors, legend_pos="upRight")
-    chart.add_series("series-A", Faker.values())
-    chart.add_series("series-B", Faker.values())
-    return chart
-
-
-page = Page()
-page.add(radar_base(), radar_legend_colors())
-page.render()
+from cutecharts.charts import Radar
+from cutecharts.components import Page
+from cutecharts.faker import Faker
+
+
+def radar_base() -> Radar:
+    chart = Radar("Radar-基本示例")
+    chart.set_options(labels=Faker.choose())
+    chart.add_series("series-A", Faker.values())
+    chart.add_series("series-B", Faker.values())
+    return chart
+
+
+radar_base().render()
+
+
+def radar_legend_colors():
+    chart = Radar("Radar-颜色调整")
+    chart.set_options(labels=Faker.choose(), colors=Faker.colors, legend_pos="upRight")
+    chart.add_series("series-A", Faker.values())
+    chart.add_series("series-B", Faker.values())
+    return chart
+
+
+page = Page()
+page.add(radar_base(), radar_legend_colors())
+page.render()

example/example_scatter.py → examples/example_scatter.py

@@ -1,47 +1,47 @@
-from cutecharts.charts import Scatter
-from cutecharts.components import Page
-from cutecharts.faker import Faker
-
-
-def scatter_base() -> Scatter:
-    chart = Scatter("Scatter-基本示例")
-    chart.set_options(x_label="I'm xlabel", y_label="I'm ylabel")
-    chart.add_series(
-        "series-A", [(z[0], z[1]) for z in zip(Faker.values(), Faker.values())]
-    )
-    chart.add_series(
-        "series-B", [(z[0], z[1]) for z in zip(Faker.values(), Faker.values())]
-    )
-    return chart
-
-
-scatter_base().render()
-
-
-def scatter_dotsize_tickcount():
-    chart = Scatter("Scatter-散点大小")
-    chart.set_options(dot_size=2, y_tick_count=8)
-    chart.add_series(
-        "series-A", [(z[0], z[1]) for z in zip(Faker.values(), Faker.values())]
-    )
-    chart.add_series(
-        "series-B", [(z[0], z[1]) for z in zip(Faker.values(), Faker.values())]
-    )
-    return chart
-
-
-def scatter_show_line():
-    chart = Scatter("Scatter-散点连成线")
-    chart.set_options(y_tick_count=8, is_show_line=True)
-    chart.add_series(
-        "series-A", [(z[0], z[1]) for z in zip(Faker.values(), Faker.values())]
-    )
-    chart.add_series(
-        "series-B", [(z[0], z[1]) for z in zip(Faker.values(), Faker.values())]
-    )
-    return chart
-
-
-page = Page()
-page.add(scatter_base(), scatter_dotsize_tickcount(), scatter_show_line())
-page.render()
+from cutecharts.charts import Scatter
+from cutecharts.components import Page
+from cutecharts.faker import Faker
+
+
+def scatter_base() -> Scatter:
+    chart = Scatter("Scatter-基本示例")
+    chart.set_options(x_label="I'm xlabel", y_label="I'm ylabel")
+    chart.add_series(
+        "series-A", [(z[0], z[1]) for z in zip(Faker.values(), Faker.values())]
+    )
+    chart.add_series(
+        "series-B", [(z[0], z[1]) for z in zip(Faker.values(), Faker.values())]
+    )
+    return chart
+
+
+scatter_base().render()
+
+
+def scatter_dotsize_tickcount():
+    chart = Scatter("Scatter-散点大小")
+    chart.set_options(dot_size=2, y_tick_count=8)
+    chart.add_series(
+        "series-A", [(z[0], z[1]) for z in zip(Faker.values(), Faker.values())]
+    )
+    chart.add_series(
+        "series-B", [(z[0], z[1]) for z in zip(Faker.values(), Faker.values())]
+    )
+    return chart
+
+
+def scatter_show_line():
+    chart = Scatter("Scatter-散点连成线")
+    chart.set_options(y_tick_count=8, is_show_line=True)
+    chart.add_series(
+        "series-A", [(z[0], z[1]) for z in zip(Faker.values(), Faker.values())]
+    )
+    chart.add_series(
+        "series-B", [(z[0], z[1]) for z in zip(Faker.values(), Faker.values())]
+    )
+    return chart
+
+
+page = Page()
+page.add(scatter_base(), scatter_dotsize_tickcount(), scatter_show_line())
+page.render()

setup.py

@@ -71,7 +71,7 @@ def run(self):
     author=about["__author__"],
     author_email=__author_email__,
     license=__license__,
-    packages=find_packages(exclude=("test",)),
+    packages=find_packages(exclude=("tests",)),
     keywords=__keywords__,
     install_requires=__requires__,
     zip_safe=False,

test.bat

@@ -1,2 +1,2 @@
-cd test
-nosetests --with-coverage --cover-package cutecharts --cover-package test && cd .. && flake8 --exclude build --max-line-length 89 --ignore=F401
+cd tests
+nosetests --with-coverage --cover-package cutecharts --cover-package tests && cd .. && flake8 --exclude build --max-line-length 89 --ignore=F401

test.sh

@@ -1,2 +1,2 @@
-cd test
-nosetests --with-coverage --cover-package cutecharts --cover-package test && cd .. && flake8 --exclude build --max-line-length 89 --ignore=F401
+cd tests
+nosetests --with-coverage --cover-package cutecharts --cover-package tests && cd .. && flake8 --exclude build --max-line-length 89 --ignore=F401

test/test_engine.py → tests/test_engine.py

@@ -1,31 +1,31 @@
-from nose.tools import assert_equal, assert_in
-
-from cutecharts.charts.basic import BasicChart
-from cutecharts.faker import Faker
-from cutecharts.globals import AssetsHost
-
-
-def test_engine_render():
-    basic = BasicChart()
-    html = basic.render()
-    assert_in(AssetsHost.DEFAULT_HOST, html)
-    assert_in("chartXkcd", html)
-
-
-def test_engine_render_notebook():
-    basic = BasicChart()
-    html = basic.render_notebook().__html__()
-    assert_in(AssetsHost.DEFAULT_HOST, html)
-    assert_in("chartXkcd", html)
-
-
-def test_load_javascript():
-    basic = BasicChart()
-    expected = ['https://cdn.jsdelivr.net/npm/chart.xkcd@1.1/dist/chart.xkcd.min.js']
-    assert_equal(basic.load_javascript().lib, expected)
-
-
-def test_faker():
-    attrs = Faker.choose()
-    values = Faker.values()
-    assert_equal(len(attrs), len(values))
+from nose.tools import assert_equal, assert_in
+
+from cutecharts.charts.basic import BasicChart
+from cutecharts.faker import Faker
+from cutecharts.globals import AssetsHost
+
+
+def test_engine_render():
+    basic = BasicChart()
+    html = basic.render()
+    assert_in(AssetsHost.DEFAULT_HOST, html)
+    assert_in("chartXkcd", html)
+
+
+def test_engine_render_notebook():
+    basic = BasicChart()
+    html = basic.render_notebook().__html__()
+    assert_in(AssetsHost.DEFAULT_HOST, html)
+    assert_in("chartXkcd", html)
+
+
+def test_load_javascript():
+    basic = BasicChart()
+    expected = ['https://cdn.jsdelivr.net/npm/chart.xkcd@1.1/dist/chart.xkcd.min.js']
+    assert_equal(basic.load_javascript().lib, expected)
+
+
+def test_faker():
+    attrs = Faker.choose()
+    values = Faker.values()
+    assert_equal(len(attrs), len(values))

test/test_page.py → tests/test_page.py

@@ -1,41 +1,41 @@
-from nose.tools import assert_equal, assert_false, assert_true
-
-from cutecharts.charts import Bar, Line
-from cutecharts.components import Page
-
-
-def gen_bar_base() -> Bar:
-    c = Bar("Bar")
-    c.set_options(labels=["A", "B"], x_label="I'm xlabel", y_label="I'm ylabel")
-    c.add_series("series-A", ["1", "2"])
-    return c
-
-
-def gen_line_base() -> Line:
-    c = Line("Line")
-    c.set_options(labels=["A", "B"], x_label="I'm xlabel", y_label="I'm ylabel")
-    c.add_series("series-A", ["1", "2"])
-    return c
-
-
-def test_page_iter():
-    charts = [gen_bar_base(), gen_line_base()]
-    p = Page()
-    p.add(*charts)
-
-    for idx, c in enumerate(p):
-        assert_equal(c, charts[idx])
-
-    assert_equal(len(p), len(charts))
-
-
-def test_page_before_render():
-    charts = [gen_bar_base(), gen_line_base()]
-    p = Page()
-    p.add(*charts)
-
-    assert_false(hasattr(p, "local_cfg"))
-    assert_false(hasattr(p, "notebook_cfg"))
-    p.before_render()
-    assert_true(hasattr(p, "local_cfg"))
-    assert_true(hasattr(p, "notebook_cfg"))
+from nose.tools import assert_equal, assert_false, assert_true
+
+from cutecharts.charts import Bar, Line
+from cutecharts.components import Page
+
+
+def gen_bar_base() -> Bar:
+    c = Bar("Bar")
+    c.set_options(labels=["A", "B"], x_label="I'm xlabel", y_label="I'm ylabel")
+    c.add_series("series-A", ["1", "2"])
+    return c
+
+
+def gen_line_base() -> Line:
+    c = Line("Line")
+    c.set_options(labels=["A", "B"], x_label="I'm xlabel", y_label="I'm ylabel")
+    c.add_series("series-A", ["1", "2"])
+    return c
+
+
+def test_page_iter():
+    charts = [gen_bar_base(), gen_line_base()]
+    p = Page()
+    p.add(*charts)
+
+    for idx, c in enumerate(p):
+        assert_equal(c, charts[idx])
+
+    assert_equal(len(p), len(charts))
+
+
+def test_page_before_render():
+    charts = [gen_bar_base(), gen_line_base()]
+    p = Page()
+    p.add(*charts)
+
+    assert_false(hasattr(p, "local_cfg"))
+    assert_false(hasattr(p, "notebook_cfg"))
+    p.before_render()
+    assert_true(hasattr(p, "local_cfg"))
+    assert_true(hasattr(p, "notebook_cfg"))