[med-svn] [Git][med-team/q2templates][upstream] 2 commits: New upstream version 2021.8.0
Steffen Möller (@moeller)
gitlab at salsa.debian.org
Mon Sep 27 15:34:26 BST 2021
Steffen Möller pushed to branch upstream at Debian Med / q2templates
Commits:
f229b5a4 by Steffen Moeller at 2021-09-27T13:34:03+02:00
New upstream version 2021.8.0
- - - - -
d3f66fc6 by Steffen Moeller at 2021-09-27T15:07:20+02:00
New upstream version 2021.8.0+ds
- - - - -
17 changed files:
- + .github/workflows/ci.yml
- − .travis.yml
- LICENSE
- README.md
- − ci/recipe/conda_build_config.yaml
- ci/recipe/meta.yaml
- 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
=====================================
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/2dff19c8c0337628cf067bef788a6fa660f055b5...d3f66fc6c9c2a1d9a08471706154270053424877
--
View it on GitLab: https://salsa.debian.org/med-team/q2templates/-/compare/2dff19c8c0337628cf067bef788a6fa660f055b5...d3f66fc6c9c2a1d9a08471706154270053424877
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/bb09edf4/attachment-0001.htm>
More information about the debian-med-commit
mailing list