Merge pull request #5 from conestack/mxmake

Mxmake

Author: rnixx

.gitignore

@@ -1,7 +1,21 @@
+.python-version
 *.egg-info
-.vscode
-/docs/html
-/node_modules
-/venv
-__pycache__
-package-lock.json
+*.pyc
+*.pyo
+/.mxmake/
+/.project
+/.venv/
+/.vscode/
+/constraints-mxdev.txt
+/coverage/
+.coverage
+/dist/
+/node_modules/
+/package-lock.json
+/pnpm-lock.yaml
+/requirements-mxdev.txt
+/sources/
+/src/cone.calendar.egg-info/
+/var/
+/venv/
+

CHANGES.rst

@@ -4,5 +4,11 @@ Changes
 0.1 (unreleased)
 ----------------
 
+- Setup Makefile.
+  [lenadax]
+
+- Run tests with pytest.
+  [lenadax]
+
 - Initial work.
   [rnix, toalba, lenadax]

Makefile

@@ -1,5 +1,5 @@
 import cleanup from 'rollup-plugin-cleanup';
-import {terser} from 'rollup-plugin-terser';
+import terser from '@rollup/plugin-terser';
 
 const out_dir = 'src/cone/charts/browser/static/cone_charts';
 

js/rollup.conf.js

@@ -0,0 +1,98 @@
+[settings]
+threads = 5
+
+version-overrides =
+    pyramid==1.9.4
+    repoze.zcml==1.1
+    repoze.workflow==1.1
+
+main-package = -e .[test]
+
+mxmake-templates =
+    run-tests
+    run-coverage
+
+mxmake-test-path = src
+mxmake-source-path = src/cone/charts
+
+cs = https://github.com/conestack
+cs_push = git@github.com:conestack
+bda = https://github.com/bluedynamics
+bda_push = git@github.com:bluedynamics
+
+[mxmake-env]
+TESTRUN_MARKER = 1
+
+[mxmake-run-tests]
+environment = env
+
+[mxmake-run-coverage]
+environment = env
+
+[odict]
+url = ${settings:cs}/odict.git
+pushurl = ${settings:cs_push}/odict.git
+branch = master
+mxmake-test-path = src
+mxmake-source-path = src/odict
+
+[plumber]
+url = ${settings:cs}/plumber.git
+pushurl = ${settings:cs_push}/plumber.git
+branch = master
+mxmake-test-path = src
+mxmake-source-path = src/plumber
+
+[node]
+url = ${settings:cs}/node.git
+pushurl = ${settings:cs_push}/node.git
+branch = master
+mxmake-test-path = src
+mxmake-source-path = src/node
+
+[node.ext.ugm]
+url = ${settings:cs}/node.ext.ugm.git
+pushurl = ${settings:cs_push}/node.ext.ugm.git
+branch = master
+mxmake-test-path = src
+mxmake-source-path = src/node/ext/ugm
+
+[webresource]
+url = ${settings:cs}/webresource.git
+pushurl = ${settings:cs_push}/webresource.git
+branch = master
+mxmake-test-path = .
+mxmake-source-path = webresource
+
+[treibstoff]
+url = ${settings:cs}/treibstoff.git
+pushurl = ${settings:cs_push}/treibstoff.git
+branch = master
+
+[cone.tile]
+url = ${settings:cs}/cone.tile.git
+pushurl = ${settings:cs_push}/cone.tile.git
+branch = master
+mxmake-test-path = src
+mxmake-source-path = src/cone/tile
+
+[cone.app]
+url = ${settings:cs}/cone.app.git
+pushurl = ${settings:cs_push}/cone.app.git
+branch = 2.0
+mxmake-test-path = src
+mxmake-source-path = src/cone/app
+
+[yafowil]
+url = ${settings:cs}/yafowil.git
+pushurl = ${settings:cs_push}/yafowil.git
+branch = master
+mxmake-test-path = src
+mxmake-source-path = src/yafowil
+
+[yafowil.bootstrap]
+url = ${settings:cs}/yafowil.bootstrap.git
+pushurl = ${settings:cs_push}/yafowil.bootstrap.git
+branch = bs5
+mxmake-test-path = src
+mxmake-source-path = src/yafowil/bootstrap

mx.ini

@@ -2,6 +2,7 @@
   "name": "cone.charts",
   "version": "0.1.0-dev",
   "devDependencies": {
+    "@rollup/plugin-terser": "^0.4.4",
     "jquery": "github:jquery/jquery#main",
     "jsdoc": "^4.0.0",
     "karma": "^6.4.1",
@@ -10,8 +11,7 @@
     "karma-module-resolver-preprocessor": "^1.1.3",
     "karma-qunit": "^4.1.2",
     "qunit": "^2.19.3",
-    "rollup": "^2.79.1",
-    "rollup-plugin-cleanup": "^3.2.1",
-    "rollup-plugin-terser": "^7.0.2"
+    "rollup": "^2.79.2",
+    "rollup-plugin-cleanup": "^3.2.1"
   }
 }

package.json

@@ -1,6 +1,5 @@
 from setuptools import find_packages
 from setuptools import setup
-from setuptools.command.test import test
 import os
 
 
@@ -18,12 +17,6 @@ def read_file(name):
 ]])
 
 
-class Test(test):
-
-    def run_tests(self):
-        from cone.charts import tests
-        tests.run_tests()
-
 
 setup(
     name='cone.charts',
@@ -47,11 +40,13 @@ def run_tests(self):
     zip_safe=False,
     install_requires=[
         'setuptools',
-        'cone.app'
+        'cone.app[lxml]>=1.0.3',
+        'yafowil.yaml'
     ],
     extras_require=dict(
         test=[
-            'zope.testrunner'
+            'zope.pytestlayer',
+            'pytest',
         ],
         docs=[
             'Jinja2<3.0',
@@ -60,7 +55,5 @@ def run_tests(self):
             'sphinx-conestack-theme',
             'sphinx-js'
         ]
-    ),
-    tests_require=['zope.testrunner'],
-    cmdclass=dict(test=Test)
+    )
 )

setup.py

@@ -23,13 +23,13 @@ var cone_charts = (function (exports, $) {
             this.params = settings.params;
             this.data = null;
             this.chart = null;
-            this.on_data_load = this.on_data_load.bind(this);
-            this.prepare_options();
-            this.prepare_params();
+            this.on_before_load = this.on_before_load.bind(this);
+            this.on_data_loaded = this.on_data_loaded.bind(this);
             this.load();
         }
         load() {
             this.unload();
+            this.trigger('on_before_load');
             ts.ajax.request({
                 url: this.data_source,
                 type: 'json',
@@ -38,27 +38,23 @@ var cone_charts = (function (exports, $) {
                 params: this.params,
                 success: (data) => {
                     this.data = data;
-                    this.prepare_data();
-                    this.trigger('on_data_load');
+                    this.trigger('on_data_loaded');
                 }
             });
         }
         unload() {
             if (this.chart !== null) {
                 this.chart.destroy();
+                this.chart = null;
             }
         }
         destroy() {
             this.unload();
         }
-        on_data_load() {
-            this.create_chart();
-        }
-        prepare_options() {
-        }
-        prepare_params() {
+        on_before_load() {
         }
-        prepare_data() {
+        on_data_loaded() {
+            this.create_chart();
         }
         create_chart() {
             this.chart = new Chart(this.canvas, {
@@ -70,11 +66,7 @@ var cone_charts = (function (exports, $) {
     }
 
     $(function () {
-        if (window.ts !== undefined) {
-            ts.ajax.register(ChartTile.initialize, true);
-        } else {
-            bdajax.register(ChartTile.initialize, true);
-        }
+        ts.ajax.register(ChartTile.initialize, true);
     });
 
     exports.ChartTile = ChartTile;

src/cone/charts/browser/static/cone_charts/cone.charts.js

@@ -337,7 +337,7 @@ def chart_data(model, request):
             '</div>'
         ))
 
-        from cone.charts.tests import chart_data_test_chart_model
+        from cone.charts.tests.test_package import chart_data_test_chart_model
         self.assertEqual(chart_data_test_chart_model.__doc__,
             'Dynamically created by cone.chart.browser.chart.chart_tile'
         )
@@ -424,11 +424,11 @@ def test_cone_charts_resources(self):
 
 
 def run_tests():
-    from cone.charts import tests
+    from cone.charts.browser.tests import test_package
     from zope.testrunner.runner import Runner
 
     suite = unittest.TestSuite()
-    suite.addTest(unittest.findTestCases(tests))
+    suite.addTest(unittest.findTestCases(test_package))
 
     runner = Runner(found_suites=[suite])
     runner.run()