[med-svn] [Git][med-team/q2templates][master] 15 commits: Exclude more files from source code and add license for versioneer.py
Andreas Tille
gitlab at salsa.debian.org
Tue Nov 12 07:35:36 GMT 2019
Andreas Tille pushed to branch master at Debian Med / q2templates
Commits:
8a2d3a17 by Andreas Tille at 2019-11-12T07:08:51Z
Exclude more files from source code and add license for versioneer.py
- - - - -
758da3c8 by Andreas Tille at 2019-11-12T07:09:45Z
New upstream version 2019.10.0+dfsg
- - - - -
dd5a91a4 by Andreas Tille at 2019-11-12T07:09:45Z
New upstream version
- - - - -
65b0b36f by Andreas Tille at 2019-11-12T07:09:45Z
Update upstream source from tag 'upstream/2019.10.0+dfsg'
Update to upstream version '2019.10.0+dfsg'
with Debian dir dc27f718251165bc07d516f0d68703c7e7f17ab8
- - - - -
0ec09323 by Andreas Tille at 2019-11-12T07:09:52Z
Standards-Version: 4.4.1
- - - - -
a939da67 by Andreas Tille at 2019-11-12T07:10:17Z
Respect DEB_BUILD_OPTIONS in override_dh_auto_test target
- - - - -
45ddb06e by Andreas Tille at 2019-11-12T07:10:17Z
Remove trailing whitespace in debian/changelog
- - - - -
fee427db by Andreas Tille at 2019-11-12T07:10:18Z
Set debhelper-compat version in Build-Depends.
- - - - -
fcf8e755 by Andreas Tille at 2019-11-12T07:10:21Z
Set upstream metadata fields: Repository.
- - - - -
1892ac35 by Andreas Tille at 2019-11-12T07:13:55Z
Cleanup changelog after autogenerated changes. Since this might become the first official release we keep only this in changelog
- - - - -
a1e5d50e by Andreas Tille at 2019-11-12T07:15:48Z
Cleanup rules from boilerplate
- - - - -
14c4d736 by Andreas Tille at 2019-11-12T07:19:28Z
No idea what "-a custom" should be approach - but its causing an error and I thus removed it
- - - - -
3ddc3f69 by Andreas Tille at 2019-11-12T07:23:00Z
Also bootstrap.min.css needs a symlink
- - - - -
f57e52b8 by Andreas Tille at 2019-11-12T07:26:36Z
Remove non-functional autopkgtest boilerplate
- - - - -
546dade6 by Andreas Tille at 2019-11-12T07:26:57Z
Upload to unstable
- - - - -
16 changed files:
- − debian/README.test
- debian/changelog
- debian/control
- debian/copyright
- debian/rules
- − debian/tests/control
- − debian/tests/run-unit-test
- debian/upstream/metadata
- q2templates/_version.py
- − q2templates/templates/assets/css/bootstrap.min.css
- − q2templates/templates/assets/css/normalize.css
- − q2templates/templates/assets/fonts/glyphicons-halflings-regular.eot
- − q2templates/templates/assets/fonts/glyphicons-halflings-regular.svg
- − q2templates/templates/assets/fonts/glyphicons-halflings-regular.ttf
- − q2templates/templates/assets/fonts/glyphicons-halflings-regular.woff
- − q2templates/templates/assets/fonts/glyphicons-halflings-regular.woff2
Changes:
=====================================
debian/README.test deleted
=====================================
@@ -1,8 +0,0 @@
-Notes on how this package can be tested.
-────────────────────────────────────────
-
-This package can be tested by running the provided test:
-
- sh run-unit-test
-
-in order to confirm its integrity.
=====================================
debian/changelog
=====================================
@@ -1,14 +1,5 @@
-q2templates (2019.7.0+dfsg-1) unstable; urgency=medium
-
- * New upstream version
- * Update and refresh patches
- * Standards-Version: 4.4.0
- * debhelper-compat 12
-
- -- Liubov Chuprikova <chuprikovalv at gmail.com> Thu, 05 Sep 2019 15:03:37 +0200
-
-q2templates (2019.4.0+dfsg-1) unstable; urgency=medium
+q2templates (2019.10.0+dfsg-1) unstable; urgency=medium
* Initial release (Closes: #930151)
- -- Liubov Chuprikova <chuprikovalv at gmail.com> Wed, 05 Jun 2019 01:01:15 +0200
+ -- Liubov Chuprikova <chuprikovalv at gmail.com> Tue, 12 Nov 2019 08:10:21 +0100
=====================================
debian/control
=====================================
@@ -1,8 +1,8 @@
Source: q2templates
-Section: science
-Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Liubov Chuprikova <chuprikovalv at gmail.com>
+Section: science
+Priority: optional
Build-Depends: debhelper-compat (= 12),
dh-python,
python3,
@@ -10,7 +10,7 @@ Build-Depends: debhelper-compat (= 12),
python3-pytest,
python3-pandas,
python3-jinja2
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
Vcs-Browser: https://salsa.debian.org/med-team/q2templates
Vcs-Git: https://salsa.debian.org/med-team/q2templates.git
Homepage: https://qiime2.org/
=====================================
debian/copyright
=====================================
@@ -2,11 +2,23 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: QIIME 2
Source: https://github.com/qiime2/q2templates/releases
Files-Excluded: */*.min.js
+ */bootstrap.min.css
+ */normalize.css
+ */templates/assets/fonts
Files: *
Copyright: 2016-2019 QIIME 2 development team
License: BSD-3-clause
+Files: versioneer.py
+Copyright: Brian Warner
+License: PublicDomain
+ To make Versioneer easier to embed, all its code is dedicated to the public
+ domain. The `_version.py` that it creates is also in the public domain.
+ Specifically, both are released under the Creative Commons "Public Domain
+ Dedication" license (CC0-1.0), as described in
+ https://creativecommons.org/publicdomain/zero/1.0/ .
+
Files: debian/*
Copyright: 2019 Liubov Chuprikova <chuprikovalv at gmail.com>
Andreas Tille <tille at debian.org>
=====================================
debian/rules
=====================================
@@ -1,34 +1,23 @@
#!/usr/bin/make -f
# DH_VERBOSE := 1
-export LC_ALL=C.UTF-8
-# include /usr/share/dpkg/default.mk
-# this provides:
-# DEB_SOURCE: the source package name
-# DEB_VERSION: the full version of the package (epoch + upstream vers. + revision)
-# DEB_VERSION_EPOCH_UPSTREAM: the package's version without the Debian revision
-# DEB_VERSION_UPSTREAM_REVISION: the package's version without the Debian epoch
-# DEB_VERSION_UPSTREAM: the package's upstream version
-# DEB_DISTRIBUTION: the distribution(s) listed in the current entry of debian/changelog
-# SOURCE_DATE_EPOCH: the source release date as seconds since the epoch, as
-# specified by <https://reproducible-builds.org/specs/source-date-epoch/>
-
-# for hardening you might like to uncomment this:
-# export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-export PYBUILD_BEFORE_BUILD=rm -rf {dir}/q2templates/templates/assets/fonts; \
- rm {dir}/q2templates/templates/assets/css/normalize.css
-
-export PYBUILD_AFTER_INSTALL=ln -s /usr/share/javascript/bootstrap/js/bootstrap.min.js \
- {destdir}/{install_dir}/q2templates/templates/assets/js/bootstrap.min.js; \
+export PYBUILD_AFTER_INSTALL=\
+ ln -s /usr/share/javascript/bootstrap/js/bootstrap.min.js \
+ {destdir}/{install_dir}/q2templates/templates/assets/js/bootstrap.min.js; \
ln -s /usr/share/javascript/jquery/jquery.min.js \
- {destdir}/{install_dir}/q2templates/templates/assets/js/jquery.min.js; \
+ {destdir}/{install_dir}/q2templates/templates/assets/js/jquery.min.js; \
+ ln -s /usr/share/javascript/bootstrap/css/bootstrap.min.css \
+ {destdir}/{install_dir}/q2templates/templates/assets/css/bootstrap.min.css; \
ln -s /usr/share/javascript/normalize.css/normalize.css \
- {destdir}/{install_dir}/q2templates/templates/assets/css/normalize.css
+ {destdir}/{install_dir}/q2templates/templates/assets/css/normalize.css; \
+ ln -s /usr/share/javascript/bootstrap/fonts \
+ {destdir}/{install_dir}/q2templates/templates/assets/fonts
%:
dh $@ --with python3 --buildsystem=pybuild
override_dh_auto_test:
- dh_auto_test -- -s custom --test-args="cd {build_dir}; py.test-3"
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ dh_auto_test -- --test-args="cd {build_dir}; py.test-3"
+endif
=====================================
debian/tests/control deleted
=====================================
@@ -1,3 +0,0 @@
-Tests: run-unit-test
-Depends: @
-Restrictions: allow-stderr
=====================================
debian/tests/run-unit-test deleted
=====================================
@@ -1,18 +0,0 @@
-#!/bin/bash
-set -e
-
-pkg=#PACKAGENAME#
-
-if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
- AUTOPKGTEST_TMP=$(mktemp -d /tmp/${pkg}-test.XXXXXX)
- # Double quote below to expand the temporary directory variable now versus
- # later is on purpose.
- # shellcheck disable=SC2064
- trap "rm -rf ${AUTOPKGTEST_TMP}" 0 INT QUIT ABRT PIPE TERM
-fi
-
-cp -a /usr/share/doc/${pkg}/examples/* "${AUTOPKGTEST_TMP}"
-
-cd "${AUTOPKGTEST_TMP}"
-
-#do_stuff_to_test_package#
=====================================
debian/upstream/metadata
=====================================
@@ -1,5 +1,5 @@
Reference:
- - Author: >
+- Author: >
Evan Bolyen and Jai Ram Rideout and Matthew R Dillon and Nicholas A
Bokulich and Christian Abnet and Gabriel A Al-Ghalith and Harriet
Alexander and Eric J Alm and Manimozhiyan Arumugam and Francesco
@@ -33,12 +33,13 @@ Reference:
Wang and Jonathan Warren and Kyle C Weber and Chase HD Williamson
and Amy D Willis and Zhenjiang Zech Xu and Jesse R Zaneveld and
Yilong Zhang and Qiyun Zhu and Rob Knight and J Gregory Caporaso
- Title: >
+ Title: >
Reproducible, interactive, scalable and extensible microbiome data
science using QIIME 2
- Journal: Nature Biotechnology
- Year: 2019
- Volume: 37
- DOI: 10.1038/s41587-019-0209-9
- URL: https://www.nature.com/articles/s41587-019-0209-9
- eprint: https://www.nature.com/articles/s41587-019-0209-9.pdf
+ Journal: Nature Biotechnology
+ Year: 2019
+ Volume: 37
+ DOI: 10.1038/s41587-019-0209-9
+ URL: https://www.nature.com/articles/s41587-019-0209-9
+ eprint: https://www.nature.com/articles/s41587-019-0209-9.pdf
+Repository: https://github.com/qiime2/q2templates
=====================================
q2templates/_version.py
=====================================
@@ -23,9 +23,9 @@ 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 = " (tag: 2019.7.0)"
- git_full = "b9219ae56491b2bd01389ce298f77bb3a9cee46a"
- git_date = "2019-07-30 18:15:56 +0000"
+ git_refnames = " (tag: 2019.10.0)"
+ git_full = "2ea56bdbdb44d38e1bdbc9f9516cc42793911321"
+ git_date = "2019-11-01 01:04:25 +0000"
keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
return keywords
=====================================
q2templates/templates/assets/css/bootstrap.min.css deleted
=====================================
The diff for this file was not included because it is too large.
=====================================
q2templates/templates/assets/css/normalize.css deleted
=====================================
@@ -1,461 +0,0 @@
-/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
-
-/**
- * 1. Change the default font family in all browsers (opinionated).
- * 2. Correct the line height in all browsers.
- * 3. Prevent adjustments of font size after orientation changes in
- * IE on Windows Phone and in iOS.
- */
-
-/* Document
- ========================================================================== */
-
-html {
- font-family: sans-serif; /* 1 */
- line-height: 1.15; /* 2 */
- -ms-text-size-adjust: 100%; /* 3 */
- -webkit-text-size-adjust: 100%; /* 3 */
-}
-
-/* Sections
- ========================================================================== */
-
-/**
- * Remove the margin in all browsers (opinionated).
- */
-
-body {
- margin: 0;
-}
-
-/**
- * Add the correct display in IE 9-.
- */
-
-article,
-aside,
-footer,
-header,
-nav,
-section {
- display: block;
-}
-
-/**
- * Correct the font size and margin on `h1` elements within `section` and
- * `article` contexts in Chrome, Firefox, and Safari.
- */
-
-h1 {
- font-size: 2em;
- margin: 0.67em 0;
-}
-
-/* Grouping content
- ========================================================================== */
-
-/**
- * Add the correct display in IE 9-.
- * 1. Add the correct display in IE.
- */
-
-figcaption,
-figure,
-main { /* 1 */
- display: block;
-}
-
-/**
- * Add the correct margin in IE 8.
- */
-
-figure {
- margin: 1em 40px;
-}
-
-/**
- * 1. Add the correct box sizing in Firefox.
- * 2. Show the overflow in Edge and IE.
- */
-
-hr {
- box-sizing: content-box; /* 1 */
- height: 0; /* 1 */
- overflow: visible; /* 2 */
-}
-
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-
-pre {
- font-family: monospace, monospace; /* 1 */
- font-size: 1em; /* 2 */
-}
-
-/* Text-level semantics
- ========================================================================== */
-
-/**
- * 1. Remove the gray background on active links in IE 10.
- * 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
- */
-
-a {
- background-color: transparent; /* 1 */
- -webkit-text-decoration-skip: objects; /* 2 */
-}
-
-/**
- * Remove the outline on focused links when they are also active or hovered
- * in all browsers (opinionated).
- */
-
-a:active,
-a:hover {
- outline-width: 0;
-}
-
-/**
- * 1. Remove the bottom border in Firefox 39-.
- * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
- */
-
-abbr[title] {
- border-bottom: none; /* 1 */
- text-decoration: underline; /* 2 */
- text-decoration: underline dotted; /* 2 */
-}
-
-/**
- * Prevent the duplicate application of `bolder` by the next rule in Safari 6.
- */
-
-b,
-strong {
- font-weight: inherit;
-}
-
-/**
- * Add the correct font weight in Chrome, Edge, and Safari.
- */
-
-b,
-strong {
- font-weight: bolder;
-}
-
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-
-code,
-kbd,
-samp {
- font-family: monospace, monospace; /* 1 */
- font-size: 1em; /* 2 */
-}
-
-/**
- * Add the correct font style in Android 4.3-.
- */
-
-dfn {
- font-style: italic;
-}
-
-/**
- * Add the correct background and color in IE 9-.
- */
-
-mark {
- background-color: #ff0;
- color: #000;
-}
-
-/**
- * Add the correct font size in all browsers.
- */
-
-small {
- font-size: 80%;
-}
-
-/**
- * Prevent `sub` and `sup` elements from affecting the line height in
- * all browsers.
- */
-
-sub,
-sup {
- font-size: 75%;
- line-height: 0;
- position: relative;
- vertical-align: baseline;
-}
-
-sub {
- bottom: -0.25em;
-}
-
-sup {
- top: -0.5em;
-}
-
-/* Embedded content
- ========================================================================== */
-
-/**
- * Add the correct display in IE 9-.
- */
-
-audio,
-video {
- display: inline-block;
-}
-
-/**
- * Add the correct display in iOS 4-7.
- */
-
-audio:not([controls]) {
- display: none;
- height: 0;
-}
-
-/**
- * Remove the border on images inside links in IE 10-.
- */
-
-img {
- border-style: none;
-}
-
-/**
- * Hide the overflow in IE.
- */
-
-svg:not(:root) {
- overflow: hidden;
-}
-
-/* Forms
- ========================================================================== */
-
-/**
- * 1. Change the font styles in all browsers (opinionated).
- * 2. Remove the margin in Firefox and Safari.
- */
-
-button,
-input,
-optgroup,
-select,
-textarea {
- font-family: sans-serif; /* 1 */
- font-size: 100%; /* 1 */
- line-height: 1.15; /* 1 */
- margin: 0; /* 2 */
-}
-
-/**
- * Show the overflow in IE.
- * 1. Show the overflow in Edge.
- */
-
-button,
-input { /* 1 */
- overflow: visible;
-}
-
-/**
- * Remove the inheritance of text transform in Edge, Firefox, and IE.
- * 1. Remove the inheritance of text transform in Firefox.
- */
-
-button,
-select { /* 1 */
- text-transform: none;
-}
-
-/**
- * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
- * controls in Android 4.
- * 2. Correct the inability to style clickable types in iOS and Safari.
- */
-
-button,
-html [type="button"], /* 1 */
-[type="reset"],
-[type="submit"] {
- -webkit-appearance: button; /* 2 */
-}
-
-/**
- * Remove the inner border and padding in Firefox.
- */
-
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
- border-style: none;
- padding: 0;
-}
-
-/**
- * Restore the focus styles unset by the previous rule.
- */
-
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
- outline: 1px dotted ButtonText;
-}
-
-/**
- * Change the border, margin, and padding in all browsers (opinionated).
- */
-
-fieldset {
- border: 1px solid #c0c0c0;
- margin: 0 2px;
- padding: 0.35em 0.625em 0.75em;
-}
-
-/**
- * 1. Correct the text wrapping in Edge and IE.
- * 2. Correct the color inheritance from `fieldset` elements in IE.
- * 3. Remove the padding so developers are not caught out when they zero out
- * `fieldset` elements in all browsers.
- */
-
-legend {
- box-sizing: border-box; /* 1 */
- color: inherit; /* 2 */
- display: table; /* 1 */
- max-width: 100%; /* 1 */
- padding: 0; /* 3 */
- white-space: normal; /* 1 */
-}
-
-/**
- * 1. Add the correct display in IE 9-.
- * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
- */
-
-progress {
- display: inline-block; /* 1 */
- vertical-align: baseline; /* 2 */
-}
-
-/**
- * Remove the default vertical scrollbar in IE.
- */
-
-textarea {
- overflow: auto;
-}
-
-/**
- * 1. Add the correct box sizing in IE 10-.
- * 2. Remove the padding in IE 10-.
- */
-
-[type="checkbox"],
-[type="radio"] {
- box-sizing: border-box; /* 1 */
- padding: 0; /* 2 */
-}
-
-/**
- * Correct the cursor style of increment and decrement buttons in Chrome.
- */
-
-[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-outer-spin-button {
- height: auto;
-}
-
-/**
- * 1. Correct the odd appearance in Chrome and Safari.
- * 2. Correct the outline style in Safari.
- */
-
-[type="search"] {
- -webkit-appearance: textfield; /* 1 */
- outline-offset: -2px; /* 2 */
-}
-
-/**
- * Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
- */
-
-[type="search"]::-webkit-search-cancel-button,
-[type="search"]::-webkit-search-decoration {
- -webkit-appearance: none;
-}
-
-/**
- * 1. Correct the inability to style clickable types in iOS and Safari.
- * 2. Change font properties to `inherit` in Safari.
- */
-
-::-webkit-file-upload-button {
- -webkit-appearance: button; /* 1 */
- font: inherit; /* 2 */
-}
-
-/* Interactive
- ========================================================================== */
-
-/*
- * Add the correct display in IE 9-.
- * 1. Add the correct display in Edge, IE, and Firefox.
- */
-
-details, /* 1 */
-menu {
- display: block;
-}
-
-/*
- * Add the correct display in all browsers.
- */
-
-summary {
- display: list-item;
-}
-
-/* Scripting
- ========================================================================== */
-
-/**
- * Add the correct display in IE 9-.
- */
-
-canvas {
- display: inline-block;
-}
-
-/**
- * Add the correct display in IE.
- */
-
-template {
- display: none;
-}
-
-/* Hidden
- ========================================================================== */
-
-/**
- * Add the correct display in IE 10-.
- */
-
-[hidden] {
- display: none;
-}
=====================================
q2templates/templates/assets/fonts/glyphicons-halflings-regular.eot deleted
=====================================
Binary files a/q2templates/templates/assets/fonts/glyphicons-halflings-regular.eot and /dev/null differ
=====================================
q2templates/templates/assets/fonts/glyphicons-halflings-regular.svg deleted
=====================================
The diff for this file was not included because it is too large.
=====================================
q2templates/templates/assets/fonts/glyphicons-halflings-regular.ttf deleted
=====================================
Binary files a/q2templates/templates/assets/fonts/glyphicons-halflings-regular.ttf and /dev/null differ
=====================================
q2templates/templates/assets/fonts/glyphicons-halflings-regular.woff deleted
=====================================
Binary files a/q2templates/templates/assets/fonts/glyphicons-halflings-regular.woff and /dev/null differ
=====================================
q2templates/templates/assets/fonts/glyphicons-halflings-regular.woff2 deleted
=====================================
Binary files a/q2templates/templates/assets/fonts/glyphicons-halflings-regular.woff2 and /dev/null differ
View it on GitLab: https://salsa.debian.org/med-team/q2templates/compare/2eef87de0113b35fcdde5e0e0b6ffa06b2319e01...546dade64394920f2652ddb7154a2485cc68c0b2
--
View it on GitLab: https://salsa.debian.org/med-team/q2templates/compare/2eef87de0113b35fcdde5e0e0b6ffa06b2319e01...546dade64394920f2652ddb7154a2485cc68c0b2
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/20191112/a25b5325/attachment-0001.html>
More information about the debian-med-commit
mailing list