[med-svn] [Git][med-team/q2templates][master] 7 commits: routine-update: New upstream version

Steffen Möller (@moeller) gitlab at salsa.debian.org
Mon Sep 27 15:34:20 BST 2021 


Steffen Möller pushed to branch master at Debian Med / q2templates


Commits:
6e413713 by Steffen Moeller at 2021-09-27T13:34:02+02:00
routine-update: New upstream version

- - - - -
f229b5a4 by Steffen Moeller at 2021-09-27T13:34:03+02:00
New upstream version 2021.8.0
- - - - -
77c44862 by Steffen Moeller at 2021-09-27T13:34:04+02:00
Update upstream source from tag 'upstream/2021.8.0'

Update to upstream version '2021.8.0'
with Debian dir aeb90d5906d8a55a9795754bd48076b2df5a8104
- - - - -
5f6f8e4c by Steffen Moeller at 2021-09-27T13:34:05+02:00
routine-update: Standards-Version: 4.6.0

- - - - -
f016b628 by Steffen Moeller at 2021-09-27T15:06:15+02:00
routine-update: Ready to upload to unstable

- - - - -
d3f66fc6 by Steffen Moeller at 2021-09-27T15:07:20+02:00
New upstream version 2021.8.0+ds
- - - - -
fdd93fa7 by Steffen Moeller at 2021-09-27T16:34:02+02:00
Update upstream source from tag 'upstream/2021.8.0+ds'

Update to upstream version '2021.8.0+ds'
with Debian dir bd53a583de772ca7c68f46de2b794e8756cd8fb7

- - - - -


21 changed files:

- + .github/workflows/ci.yml
- − .travis.yml
- LICENSE
- README.md
- − ci/recipe/conda_build_config.yaml
- ci/recipe/meta.yaml
- debian/changelog
- debian/control
- debian/upstream/metadata
- debian/watch
- q2templates/__init__.py
- q2templates/_templates.py
- q2templates/_version.py
- q2templates/templates/assets/css/base-template.css
- q2templates/templates/assets/css/tab-parent.css
- q2templates/templates/assets/js/child.js
- q2templates/templates/assets/js/parent.js
- q2templates/tests/__init__.py
- q2templates/tests/test_util.py
- q2templates/util.py
- setup.py


Changes:

=====================================
.github/workflows/ci.yml
=====================================
@@ -0,0 +1,55 @@
+# This file is automatically generated by busywork.qiime2.org and
+# template-repos - any manual edits made to this file will be erased when
+# busywork performs maintenance updates.
+
+name: ci
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout source
+      uses: actions/checkout at v2
+
+    - name: set up python 3.8
+      uses: actions/setup-python at v1
+      with:
+        python-version: 3.8
+
+    - name: install dependencies
+      run: python -m pip install --upgrade pip
+
+    - name: lint
+      run: |
+        pip install -q https://github.com/qiime2/q2lint/archive/master.zip
+        q2lint
+        pip install -q flake8
+        flake8
+
+  build-and-test:
+    needs: lint
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: checkout source
+      uses: actions/checkout at v2
+      with:
+        fetch-depth: 0
+
+    - name: set up git repo for versioneer
+      run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+
+    - uses: qiime2/action-library-packaging at alpha1
+      with:
+        package-name: q2templates
+        build-target: dev
+        additional-tests: py.test --pyargs q2templates
+        library-token: ${{ secrets.LIBRARY_TOKEN }}


=====================================
.travis.yml deleted
=====================================
@@ -1,23 +0,0 @@
-dist: trusty
-sudo: false
-language: python
-before_install:
-  - export MPLBACKEND='Agg'
-  - wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-  - export MINICONDA_PREFIX="$HOME/miniconda"
-  - bash miniconda.sh -b -p $MINICONDA_PREFIX
-  - export PATH="$MINICONDA_PREFIX/bin:$PATH"
-  - conda config --set always_yes yes
-  - conda update -q conda
-  - conda info -a
-install:
-  - wget -q https://raw.githubusercontent.com/qiime2/environment-files/master/latest/staging/qiime2-latest-py36-linux-conda.yml
-  - conda env create -q -n test-env --file qiime2-latest-py36-linux-conda.yml
-  - source activate test-env
-  - conda install -q pytest
-  - pip install -q flake8
-  - pip install -q https://github.com/qiime2/q2lint/archive/master.zip
-  - make install
-script:
-  - make lint
-  - make test


=====================================
LICENSE
=====================================
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2016-2020, QIIME 2 development team.
+Copyright (c) 2016-2021, QIIME 2 development team.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without


=====================================
README.md
=====================================
@@ -1,2 +1,6 @@
 # q2templates
-Design template package for QIIME 2 Plugins
+
+![](https://github.com/qiime2/q2templates/workflows/ci/badge.svg)
+
+HTML templates for QIIME 2 Visualizations. For details on QIIME 2, see
+https://qiime2.org.


=====================================
ci/recipe/conda_build_config.yaml deleted
=====================================
@@ -1,2 +0,0 @@
-python:
-  - 3.6


=====================================
ci/recipe/meta.yaml
=====================================
@@ -24,6 +24,9 @@ requirements:
     - pandas >=1
 
 test:
+  requires:
+    - pytest
+
   imports:
     - q2templates
 


=====================================
debian/changelog
=====================================
@@ -1,9 +1,20 @@
-q2templates (2020.11.1+dfsg-2) UNRELEASED; urgency=medium
+q2templates (2021.8.0+ds-1) unstable; urgency=medium
 
+  [ Étienne Mollier ]
   * d/watch: fixed broken reference to github
   * d/control: updated uploader address
 
- -- Étienne Mollier <emollier at debian.org>  Mon, 05 Jul 2021 21:06:26 +0200
+  [ Steffen Moeller ]
+  * New upstream version.
+  * Standards-Version: 4.6.0 (routine-update)
+  * d/u/metadata: Cosmetics.
+  * d/watch:
+    - Cosmetics.
+    - Repacking as xz (saves ~40%) 
+    - Introducing +ds suffix
+  * Added SM to uploaders.
+
+ -- Steffen Moeller <moeller at debian.org>  Mon, 27 Sep 2021 13:35:21 +0200
 
 q2templates (2020.11.1+dfsg-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -1,7 +1,8 @@
 Source: q2templates
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Liubov Chuprikova <chuprikovalv at gmail.com>,
-           Étienne Mollier <emollier at debian.org>
+           Étienne Mollier <emollier at debian.org>,
+           Steffen Moeller <moeller at debian.org>
 Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
@@ -11,7 +12,7 @@ Build-Depends: debhelper-compat (= 13),
                python3-pytest,
                python3-pandas,
                python3-jinja2
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/q2templates
 Vcs-Git: https://salsa.debian.org/med-team/q2templates.git
 Homepage: https://qiime2.org/


=====================================
debian/upstream/metadata
=====================================
@@ -1,5 +1,8 @@
+---
 Bug-Database: https://github.com/qiime2/q2templates/issues
 Bug-Submit: https://github.com/qiime2/q2templates/issues/new
+Repository: https://github.com/qiime2/q2templates.git
+Repository-Browse: https://github.com/qiime2/q2templates
 Reference:
  - Author: >
     Evan Bolyen and Jai Ram Rideout and Matthew R Dillon and Nicholas A
@@ -44,8 +47,6 @@ Reference:
    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.git
-Repository-Browse: https://github.com/qiime2/q2templates
 Registry:
  - Name: conda:qiime2
    Entry: q2templates


=====================================
debian/watch
=====================================
@@ -1,4 +1,3 @@
 version=4
-opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
-	https://github.com/qiime2/q2templates/tags \
-	(?:.*?/)?v?(\d[\d.]*)\.tar\.gz
+opts="repack,repacksuffix=+ds,dversionmangle=auto,compression=xz,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
+https://github.com/qiime2/q2templates/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz


=====================================
q2templates/__init__.py
=====================================
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2020, QIIME 2 development team.
+# Copyright (c) 2016-2021, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #


=====================================
q2templates/_templates.py
=====================================
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2020, QIIME 2 development team.
+# Copyright (c) 2016-2021, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #


=====================================
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: 2020.11.1)"
-    git_full = "8819864cdc9db62d87f60fe9d46c445e5b0646ff"
-    git_date = "2020-12-05 20:44:51 +0000"
+    git_refnames = " (tag: 2021.8.0)"
+    git_full = "9450045c0c56dfacc46202cc1e3f1bcbfabca528"
+    git_date = "2021-09-09 18:35:29 +0000"
     keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
     return keywords
 


=====================================
q2templates/templates/assets/css/base-template.css
=====================================
@@ -1,6 +1,6 @@
 /*
 ----------------------------------------------------------------------------
-Copyright (c) 2016-2020, QIIME 2 development team.
+Copyright (c) 2016-2021, QIIME 2 development team.
 
 Distributed under the terms of the Modified BSD License.
 


=====================================
q2templates/templates/assets/css/tab-parent.css
=====================================
@@ -1,6 +1,6 @@
 /*
 ----------------------------------------------------------------------------
-Copyright (c) 2016-2020, QIIME 2 development team.
+Copyright (c) 2016-2021, QIIME 2 development team.
 
 Distributed under the terms of the Modified BSD License.
 


=====================================
q2templates/templates/assets/js/child.js
=====================================
@@ -1,5 +1,5 @@
 // ----------------------------------------------------------------------------
-// Copyright (c) 2016-2020, QIIME 2 development team.
+// Copyright (c) 2016-2021, QIIME 2 development team.
 //
 // Distributed under the terms of the Modified BSD License.
 //


=====================================
q2templates/templates/assets/js/parent.js
=====================================
@@ -1,5 +1,5 @@
 // ----------------------------------------------------------------------------
-// Copyright (c) 2016-2020, QIIME 2 development team.
+// Copyright (c) 2016-2021, QIIME 2 development team.
 //
 // Distributed under the terms of the Modified BSD License.
 //


=====================================
q2templates/tests/__init__.py
=====================================
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2020, QIIME 2 development team.
+# Copyright (c) 2016-2021, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #


=====================================
q2templates/tests/test_util.py
=====================================
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2020, QIIME 2 development team.
+# Copyright (c) 2016-2021, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #


=====================================
q2templates/util.py
=====================================
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2020, QIIME 2 development team.
+# Copyright (c) 2016-2021, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #


=====================================
setup.py
=====================================
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------
-# Copyright (c) 2016-2020, QIIME 2 development team.
+# Copyright (c) 2016-2021, QIIME 2 development team.
 #
 # Distributed under the terms of the Modified BSD License.
 #



View it on GitLab: https://salsa.debian.org/med-team/q2templates/-/compare/1086473c2eae3b161c977ff344fa21631f356d4c...fdd93fa79b2bb4fa8d3dd958acb71eadf3f23ebd

-- 
View it on GitLab: https://salsa.debian.org/med-team/q2templates/-/compare/1086473c2eae3b161c977ff344fa21631f356d4c...fdd93fa79b2bb4fa8d3dd958acb71eadf3f23ebd
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/20210927/c9946aa1/attachment-0001.htm>

More information about the debian-med-commit mailing list