[med-svn] [Git][med-team/q2-demux][master] 6 commits: Harry Potter and the Chamber of Secrets
Nilesh Patra (@nilesh)
gitlab at salsa.debian.org
Tue Aug 24 18:59:50 BST 2021
Nilesh Patra pushed to branch master at Debian Med / q2-demux
Commits:
f7111177 by Nilesh Patra at 2021-08-24T22:54:13+05:30
Harry Potter and the Chamber of Secrets
- - - - -
b61f61c7 by Nilesh Patra at 2021-08-24T23:00:44+05:30
Repack to remove license files for non-existent modules in the source-tree
- - - - -
fa32ebf1 by Nilesh Patra at 2021-08-24T23:13:17+05:30
New upstream version 2020.11.1+dfsg
- - - - -
bd702071 by Nilesh Patra at 2021-08-24T23:13:17+05:30
d/salsa-ci.yml: No i386 build
- - - - -
3dd5ae68 by Nilesh Patra at 2021-08-24T23:13:17+05:30
d/tests/run-unit-test: We are prepped for the test, lets not cheat
- - - - -
204a7600 by Nilesh Patra at 2021-08-24T23:13:48+05:30
Upload to unstable
- - - - -
11 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/0001-make-compatible-with-webpack4.patch
- + debian/patches/series
- debian/rules
- debian/salsa-ci.yml
- debian/tests/run-unit-test
- debian/watch
- − q2_demux/_summarize/assets/licenses/d3-license.txt
- q2_demux/_version.py
Changes:
=====================================
debian/changelog
=====================================
@@ -1,14 +1,19 @@
-q2-demux (2020.11.1-2) UNRELEASED; urgency=medium
+q2-demux (2020.11.1+dfsg-1) unstable; urgency=medium
+ * Team Upload.
[ Steffen Moeller ]
* Fixed d/watch.
- * First cheap "reuse-Makefile"-shot to create webpack dist
- @Nilesh
- * Please help to make this as efficient as for q2-diversity.
- Webpack crashed under my hands.
+ [ Nilesh Patra ]
+ * Get JS source building
+ * Repack to remove license files for non-existent
+ modules in the source-tree
+ * New upstream version 2020.11.1+dfsg
+ * d/salsa-ci.yml: No i386 build
+ * d/tests/run-unit-test: the dis directory exists in the
+ source, do not create explicitly
- -- Steffen Moeller <moeller at debian.org> Sun, 25 Jul 2021 18:09:41 +0200
+ -- Nilesh Patra <nilesh at debian.org> Tue, 24 Aug 2021 23:01:00 +0530
q2-demux (2020.11.1-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -8,9 +8,10 @@ Build-Depends: debhelper-compat (= 13),
dh-python,
python3,
python3-setuptools,
- nodejs,
- npm,
webpack,
+ node-uglifyjs-webpack-plugin,
+ node-babel-loader,
+ node-d3,
python3-pytest-cov,
python3-yaml,
python3-pandas,
@@ -41,7 +42,8 @@ Depends: ${shlibs:Depends},
python3-ipywidgets,
qiime,
q2-types,
- q2templates
+ q2templates,
+ node-d3
Description: QIIME 2 plugin for demultiplexing of sequence reads
QIIME 2 is a powerful, extensible, and decentralized microbiome analysis
package with a focus on data and analysis transparency. QIIME 2 enables
=====================================
debian/copyright
=====================================
@@ -1,6 +1,7 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: QIIME 2
Source: https://github.com/qiime2/q2-demux/releases
+Files-Excluded: q2_demux/_summarize/assets/licenses
Files: *
Copyright: 2016-2019 QIIME 2 development team
=====================================
debian/patches/0001-make-compatible-with-webpack4.patch
=====================================
@@ -0,0 +1,60 @@
+Description: webpack.config.js in incompatible with webpack4 API, Hence did the needed changes
+Author: Nilesh Patra <nilesh at debian.org>
+Last-Update: 2021-08-24
+--- a/q2_demux/_summarize/assets/webpack.config.js
++++ b/q2_demux/_summarize/assets/webpack.config.js
+@@ -8,19 +8,20 @@
+
+ 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 },
+- mangle: { except: ['init'] }
++ new UglifyJsPlugin({
++ uglifyOptions: {
++ "warnings": false
++ }
+ }),
+- new webpack.NoErrorsPlugin(),
++ new webpack.NoEmitOnErrorsPlugin(),
+ ],
+ output: {
+ path: __dirname,
+@@ -32,14 +33,22 @@
+ extensions: ['', '.js']
+ },
+ module: {
+- loaders: [
++ rules: [
+ {
+- 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'],
++}
+ };
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-make-compatible-with-webpack4.patch
=====================================
debian/rules
=====================================
@@ -16,9 +16,8 @@ export PYBUILD_BEFORE_INSTALL=rm -rvf {build_dir}/q2-demux.egg-* {build_dir}/sit
override_dh_auto_build:
dh_auto_build
- #cd q2_demux/_summarize/assets && \
- #webpack --bail
- make viz-summarize
+ cd q2_demux/_summarize/assets && \
+ webpack --bail
#FIXME: Delaying true testing to auto-pkg-tests since QIIME2 module cannot be registered
# at build time.
=====================================
debian/salsa-ci.yml
=====================================
@@ -2,3 +2,7 @@
include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+# i386 CI disabled due to unavailable python3-skbio for i386 architecture
+variables:
+ SALSA_CI_DISABLE_BUILD_PACKAGE_I386: "true"
=====================================
debian/tests/run-unit-test
=====================================
@@ -9,7 +9,6 @@ if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
fi
cp -a /usr/lib/python3/dist-packages/${pkg}* "${AUTOPKGTEST_TMP}"
-mkdir ${AUTOPKGTEST_TMP}/q2_demux/_summarize/assets/dist
cd "${AUTOPKGTEST_TMP}"
=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
version=4
-opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%,repacksuffix=+dfsg,repack,compression=xz,dversionmangle=auto" \
https://github.com/qiime2/q2-demux/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz
=====================================
q2_demux/_summarize/assets/licenses/d3-license.txt deleted
=====================================
@@ -1,27 +0,0 @@
-Copyright 2010-2016 Mike Bostock
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-* Neither the name of the author nor the names of contributors may be used to
- endorse or promote products derived from this software without specific prior
- written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=====================================
q2_demux/_version.py
=====================================
@@ -23,7 +23,7 @@ def get_keywords():
# setup.py/versioneer.py will grep for the variable names, so they must
# each be defined on a line of their own. _version.py will just call
# get_keywords().
- git_refnames = " (HEAD -> master, tag: 2020.11.1)"
+ git_refnames = " (tag: 2020.11.1)"
git_full = "5769fc493a3a6479b2d648151fb1a10c8b1426fd"
git_date = "2020-12-05 20:44:49 +0000"
keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
View it on GitLab: https://salsa.debian.org/med-team/q2-demux/-/compare/f27dfd15abc3522b64a22d7c15b35f88169966ee...204a7600bf9ca57d2c4c17e9e9ef37c01f8853f7
--
View it on GitLab: https://salsa.debian.org/med-team/q2-demux/-/compare/f27dfd15abc3522b64a22d7c15b35f88169966ee...204a7600bf9ca57d2c4c17e9e9ef37c01f8853f7
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/20210824/cf1af99b/attachment-0001.htm>
More information about the debian-med-commit
mailing list