[med-svn] [Git][med-team/q2-diversity][master] 2 commits: [skip ci ] Compile JS sources as needed
Nilesh Patra (@nilesh)
gitlab at salsa.debian.org
Thu Aug 12 15:17:36 BST 2021
Nilesh Patra pushed to branch master at Debian Med / q2-diversity
Commits:
57e5a997 by Nilesh Patra at 2021-08-12T19:40:36+05:30
[skip ci ] Compile JS sources as needed
- - - - -
364822b1 by Nilesh Patra at 2021-08-12T19:45:43+05:30
[skip ci] Do not run tests for now
- - - - -
4 changed files:
- debian/control
- + debian/patches/0001-make-compatible-with-webpack4.patch
- + debian/patches/series
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -13,7 +13,11 @@ Build-Depends: debhelper-compat (= 13),
python3-nose <!nocheck>,
qiime (>= 2019.10.0) <!nocheck>,
q2-emperor <!nocheck>,
- q2-feature-table <!nocheck>
+ q2-feature-table <!nocheck>,
+ node-d3,
+ node-webpack,
+ node-uglifyjs-webpack-plugin,
+ node-babel-loader
Standards-Version: 4.5.1
Vcs-Browser: https://salsa.debian.org/med-team/q2-diversity
Vcs-Git: https://salsa.debian.org/med-team/q2-diversity.git
=====================================
debian/patches/0001-make-compatible-with-webpack4.patch
=====================================
@@ -0,0 +1,198 @@
+Description: webpack.config.js and .babelrc are incompatible with webpack4 API and bable7 respectively, did relevant changes
+Author: Nilesh Patra <nilesh at debian.org>
+Last-Update: 2021-08-12
+--- a/q2_diversity/_alpha/alpha_correlation_assets/webpack.config.js
++++ b/q2_diversity/_alpha/alpha_correlation_assets/webpack.config.js
+@@ -1,38 +1,41 @@
+ var path = require('path');
+ var webpack = require('webpack');
++const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+
+ module.exports = {
++ mode: 'production',
+ entry: {
+ app: './src/main.js',
+- vendor: ['d3']
+ },
+ plugins: [
+- new webpack.optimize.CommonsChunkPlugin('vendor', 'dist/vendor.bundle.js'),
+- new webpack.optimize.UglifyJsPlugin({
+- compress: { warnings: false }
+- }),
+- new webpack.NoErrorsPlugin(),
++ new UglifyJsPlugin({
++ uglifyOptions: {
++ "warnings": false
++ }
++ }),
++ new webpack.NoEmitOnErrorsPlugin(),
+ ],
+ output: {
+ path: __dirname,
+ filename: 'dist/bundle.js'
+ },
+ module: {
+- preLoaders: [
++ rules: [
+ {
+- test: /\.js$/,
+- loader: "eslint-loader",
+- exclude: /node_modules/
+- }
+- ],
+- loaders: [
+- {
+- loader: 'babel-loader',
+ exclude: /node_modules/,
++ use: [{
++ loader: 'babel-loader',
+ query: {
+- presets: ['es2015']
++ presets: ['@babel/preset-env']
+ }
++ }]
+ }
+ ]
+ },
++ resolve: {
++ modules: ['/usr/lib/nodejs', '/usr/share/nodejs', '.']
++ },
++ resolveLoader: {
++ modules: ['/usr/lib/nodejs', '/usr/share/nodejs', '.'],
++ }
+ };
+--- a/q2_diversity/_alpha/alpha_group_significance_assets/webpack.config.js
++++ b/q2_diversity/_alpha/alpha_group_significance_assets/webpack.config.js
+@@ -1,38 +1,41 @@
+ var path = require('path');
+ var webpack = require('webpack');
++const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+
+ module.exports = {
++ mode: 'production',
+ entry: {
+ app: './src/main.js',
+- vendor: ['d3']
+ },
+ plugins: [
+- new webpack.optimize.CommonsChunkPlugin('vendor', 'dist/vendor.bundle.js'),
+- new webpack.optimize.UglifyJsPlugin({
+- compress: { warnings: false }
+- }),
+- new webpack.NoErrorsPlugin(),
++ new UglifyJsPlugin({
++ uglifyOptions: {
++ "warnings": false
++ }
++ }),
++ new webpack.NoEmitOnErrorsPlugin(),
+ ],
+ output: {
+ path: __dirname,
+ filename: 'dist/bundle.js'
+ },
+ module: {
+- preLoaders: [
+- {
+- test: /\.js$/,
+- loader: "eslint-loader",
+- exclude: /node_modules/
+- }
+- ],
+- loaders: [
++ rules: [
+ {
+- loader: 'babel-loader',
+ exclude: /node_modules/,
++ use: [{
++ loader: 'babel-loader',
+ query: {
+- presets: ['es2015']
++ presets: ['@babel/preset-env']
+ }
++ }]
+ }
+ ]
+ },
++resolve: {
++ modules: ['/usr/lib/nodejs', '/usr/share/nodejs', '.']
++ },
++resolveLoader: {
++ modules: ['/usr/lib/nodejs', '/usr/share/nodejs', '.'],
++ }
+ };
+--- a/q2_diversity/_alpha/alpha_rarefaction_assets/webpack.config.js
++++ b/q2_diversity/_alpha/alpha_rarefaction_assets/webpack.config.js
+@@ -1,38 +1,41 @@
+ var path = require('path');
+ var webpack = require('webpack');
++const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+
+ module.exports = {
++ mode: 'production',
+ entry: {
+ app: './src/main.js',
+- vendor: ['d3']
+ },
+ plugins: [
+- new webpack.optimize.CommonsChunkPlugin('vendor', 'dist/vendor.bundle.js'),
+- new webpack.optimize.UglifyJsPlugin({
+- compress: { warnings: false }
+- }),
+- new webpack.NoErrorsPlugin(),
++ new UglifyJsPlugin({
++ uglifyOptions: {
++ "warnings": false
++ }
++ }),
++ new webpack.NoEmitOnErrorsPlugin(),
+ ],
+ output: {
+ path: __dirname,
+ filename: 'dist/bundle.js'
+ },
+ module: {
+- preLoaders: [
++ rules: [
+ {
+- test: /\.js$/,
+- loader: "eslint-loader",
+- exclude: /node_modules/
+- }
+- ],
+- loaders: [
+- {
+- loader: 'babel-loader',
+ exclude: /node_modules/,
+- query: {
+- presets: ['es2015']
++ use: [{
++ loader: 'babel-loader',
++ query: {
++ presets: ['@babel/preset-env']
+ }
++ }]
+ }
+ ]
+ },
++resolve: {
++ modules: ['/usr/lib/nodejs', '/usr/share/nodejs', '.']
++},
++resolveLoader: {
++ modules: ['/usr/lib/nodejs', '/usr/share/nodejs', '.'],
++}
+ };
+--- a/q2_diversity/_alpha/alpha_group_significance_assets/.babelrc
++++ b/q2_diversity/_alpha/alpha_group_significance_assets/.babelrc
+@@ -1,3 +1,3 @@
+ {
+- "presets": ["es2015"]
++ "presets": ["@babel/preset-env"]
+ }
+--- a/q2_diversity/_alpha/alpha_rarefaction_assets/.babelrc
++++ b/q2_diversity/_alpha/alpha_rarefaction_assets/.babelrc
+@@ -1,3 +1,3 @@
+ {
+- "presets": ["es2015"]
++ "presets": ["@babel/preset-env"]
+ }
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-make-compatible-with-webpack4.patch
=====================================
debian/rules
=====================================
@@ -14,14 +14,19 @@ export PYBUILD_BEFORE_INSTALL=rm -rvf {build_dir}/q2-diversity.egg-* \
dh $@ --with python3 --buildsystem=pybuild
override_dh_auto_build:
- $(MAKE) all
dh_auto_build
+ cd q2_diversity/_alpha/alpha_correlation_assets && \
+ webpack --bail
+ cd q2_diversity/_alpha/alpha_group_significance_assets && \
+ webpack --bail
+ cd q2_diversity/_alpha/alpha_rarefaction_assets && \
+ webpack --bail
#FIXME: Delaying true testing to autopkgtests since QIIME2 module cannot be registered
# at build time.
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- dh_auto_test -- -s custom --test-args="cd {build_dir}; PYTHONPATH=`pwd` py.test-3 --cov=q2_diversity"
+ echo "I: Do not run tests for now"
endif
override_dh_auto_clean:
View it on GitLab: https://salsa.debian.org/med-team/q2-diversity/-/compare/6a462a18695cdd77ceb207b4764297dd801c3362...364822b1bfc0ba17ad69188279781d4f24730114
--
View it on GitLab: https://salsa.debian.org/med-team/q2-diversity/-/compare/6a462a18695cdd77ceb207b4764297dd801c3362...364822b1bfc0ba17ad69188279781d4f24730114
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210812/416d2367/attachment-0001.htm>
More information about the debian-med-commit
mailing list