[med-svn] [Git][med-team/q2-emperor][master] 9 commits: Bump versioned Depends
Andreas Tille (@tille)
gitlab at salsa.debian.org
Fri Jan 13 07:53:27 GMT 2023
Andreas Tille pushed to branch master at Debian Med / q2-emperor
Commits:
1aaa4dd5 by Andreas Tille at 2023-01-13T06:58:19+01:00
Bump versioned Depends
- - - - -
35d18053 by Andreas Tille at 2023-01-13T06:58:36+01:00
New upstream version 2022.11.1
- - - - -
344a1899 by Andreas Tille at 2023-01-13T06:58:36+01:00
routine-update: New upstream version
- - - - -
33018bf9 by Andreas Tille at 2023-01-13T06:58:37+01:00
Update upstream source from tag 'upstream/2022.11.1'
Update to upstream version '2022.11.1'
with Debian dir 47018c81803dabe166724fa4e5e4f71f37e99e20
- - - - -
166fac3b by Andreas Tille at 2023-01-13T06:58:37+01:00
routine-update: Standards-Version: 4.6.2
- - - - -
ef290b8f by Andreas Tille at 2023-01-13T06:58:48+01:00
Remove unused license definitions for GPL-2+.
Changes-By: lintian-brush
Fixes: lintian: unused-license-paragraph-in-dep5-copyright
See-also: https://lintian.debian.org/tags/unused-license-paragraph-in-dep5-copyright.html
- - - - -
7ee480bf by Andreas Tille at 2023-01-13T08:30:23+01:00
Delay build-time test since registration in qiime2 can't be done at that point in time
- - - - -
98006568 by Andreas Tille at 2023-01-13T08:52:26+01:00
Upload to experimental
- - - - -
6af77f5e by Andreas Tille at 2023-01-13T08:52:41+01:00
Fix copyright
- - - - -
20 changed files:
- + .github/CONTRIBUTING.md
- + .github/ISSUE_TEMPLATE/1-user-need-help.md
- + .github/ISSUE_TEMPLATE/2-dev-need-help.md
- + .github/ISSUE_TEMPLATE/3-found-bug.md
- + .github/ISSUE_TEMPLATE/4-make-better.md
- + .github/ISSUE_TEMPLATE/5-make-new.md
- + .github/ISSUE_TEMPLATE/6-where-to-go.md
- + .github/SUPPORT.md
- + .github/pull_request_template.md
- + .github/rubric.png
- + .github/workflows/add-to-project-ci.yml
- + .github/workflows/ci.yml
- debian/changelog
- debian/control
- debian/copyright
- debian/rules
- + q2_emperor/_examples.py
- q2_emperor/_version.py
- q2_emperor/plugin_setup.py
- q2_emperor/tests/test_plot.py
Changes:
=====================================
.github/CONTRIBUTING.md
=====================================
@@ -0,0 +1,23 @@
+# Contributing to this project
+
+Thanks for thinking of us :heart: :tada: - we would love a helping hand!
+
+## I just have a question
+
+> Note: Please don't file an issue to ask a question. You'll get faster results
+> by using the resources below.
+
+### QIIME 2 Users
+
+Check out the [User Docs](https://docs.qiime2.org) - there are many tutorials,
+walkthroughs, and guides available. If you still need help, please visit us at
+the [QIIME 2 Forum](https://forum.qiime2.org/c/user-support).
+
+### QIIME 2 Developers
+
+Check out the [Developer Docs](https://dev.qiime2.org) - there are many
+tutorials, walkthroughs, and guides available. If you still need help, please
+visit us at the [QIIME 2 Forum](https://forum.qiime2.org/c/dev-discussion).
+
+This document is based heavily on the following:
+https://github.com/atom/atom/blob/master/CONTRIBUTING.md
=====================================
.github/ISSUE_TEMPLATE/1-user-need-help.md
=====================================
@@ -0,0 +1,14 @@
+---
+name: I am a user and I need help with QIIME 2...
+about: I am using QIIME 2 and have a question or am experiencing a problem
+
+---
+
+Have you had a chance to check out the docs?
+https://docs.qiime2.org
+There are many tutorials, walkthroughs, and guides available.
+
+If you still need help, please visit:
+https://forum.qiime2.org/c/user-support
+
+Help requests filed here will not be answered.
=====================================
.github/ISSUE_TEMPLATE/2-dev-need-help.md
=====================================
@@ -0,0 +1,12 @@
+---
+name: I am a developer and I need help with QIIME 2...
+about: I am developing a QIIME 2 plugin or interface and have a question or a problem
+
+---
+
+Have you had a chance to check out the developer docs?
+https://dev.qiime2.org
+There are many tutorials, walkthroughs, and guides available.
+
+If you still need help, please visit:
+https://forum.qiime2.org/c/dev-discussion
=====================================
.github/ISSUE_TEMPLATE/3-found-bug.md
=====================================
@@ -0,0 +1,36 @@
+---
+name: I am a developer and I found a bug...
+about: I am a developer and I found a bug that I can describe
+
+---
+
+**Bug Description**
+A clear and concise description of what the bug is.
+
+**Steps to reproduce the behavior**
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Computation Environment**
+- OS: [e.g. macOS High Sierra]
+- QIIME 2 Release [e.g. 2018.6]
+
+**Questions**
+1. An enumerated list with any questions about the problem here.
+2. If not applicable, please delete this section.
+
+**Comments**
+1. An enumerated list with any other context or comments about the problem here.
+2. If not applicable, please delete this section.
+
+**References**
+1. An enumerated list of links to relevant references, including forum posts, stack overflow, etc.
+2. If not applicable, please delete this section.
=====================================
.github/ISSUE_TEMPLATE/4-make-better.md
=====================================
@@ -0,0 +1,26 @@
+---
+name: I am a developer and I have an idea for an improvement...
+about: I am a developer and I have an idea for an improvement to existing functionality
+
+---
+
+**Improvement Description**
+A clear and concise description of what the improvement is.
+
+**Current Behavior**
+Please provide a brief description of the current behavior.
+
+**Proposed Behavior**
+Please provide a brief description of the proposed behavior.
+
+**Questions**
+1. An enumerated list of questions related to the proposal.
+2. If not applicable, please delete this section.
+
+**Comments**
+1. An enumerated list of comments related to the proposal that don't fit anywhere else.
+2. If not applicable, please delete this section.
+
+**References**
+1. An enumerated list of links to relevant references, including forum posts, stack overflow, etc.
+2. If not applicable, please delete this section.
=====================================
.github/ISSUE_TEMPLATE/5-make-new.md
=====================================
@@ -0,0 +1,26 @@
+---
+name: I am a developer and I have an idea for a new feature...
+about: I am a developer and I have an idea for new functionality
+
+---
+
+**Addition Description**
+A clear and concise description of what the addition is.
+
+**Current Behavior**
+Please provide a brief description of the current behavior, if applicable.
+
+**Proposed Behavior**
+Please provide a brief description of the proposed behavior.
+
+**Questions**
+1. An enumerated list of questions related to the proposal.
+2. If not applicable, please delete this section.
+
+**Comments**
+1. An enumerated list of comments related to the proposal that don't fit anywhere else.
+2. If not applicable, please delete this section.
+
+**References**
+1. An enumerated list of links to relevant references, including forum posts, stack overflow, etc.
+2. If not applicable, please delete this section.
=====================================
.github/ISSUE_TEMPLATE/6-where-to-go.md
=====================================
@@ -0,0 +1,147 @@
+---
+name: I don't know where to file my issue...
+about: I am a developer and I don't know which repo to file this in
+
+---
+
+The repos within the QIIME 2 GitHub Organization are listed below, with a brief description about the repo.
+
+Sorted alphabetically by repo name.
+
+- The CI automation engine that builds and distributes QIIME 2
+ https://github.com/qiime2/busywork/issues
+
+- A Concourse resource for working with conda
+ https://github.com/qiime2/conda-channel-resource/issues
+
+- Web app for vanity URLs for QIIME 2 data assets
+ https://github.com/qiime2/data.qiime2.org/issues
+
+- The Developer Documentation
+ https://github.com/qiime2/dev-docs/issues
+
+- A discourse plugin for handling queued/unqueued topics
+ https://github.com/qiime2/discourse-unhandled-tagger/issues
+
+- The User Documentation
+ https://github.com/qiime2/docs/issues
+
+- Rendered QIIME 2 environment files for conda
+ https://github.com/qiime2/environment-files/issues
+
+- Google Sheets Add-On for validating tabular data
+ https://github.com/qiime2/Keemei/issues
+
+- A docker image for linux-based busywork workers
+ https://github.com/qiime2/linux-worker-docker/issues
+
+- Official project logos
+ https://github.com/qiime2/logos/issues
+
+- The q2-alignment plugin
+ https://github.com/qiime2/q2-alignment/issues
+
+- The q2-composition plugin
+ https://github.com/qiime2/q2-composition/issues
+
+- The q2-cutadapt plugin
+ https://github.com/qiime2/q2-cutadapt/issues
+
+- The q2-dada2 plugin
+ https://github.com/qiime2/q2-dada2/issues
+
+- The q2-deblur plugin
+ https://github.com/qiime2/q2-deblur/issues
+
+- The q2-demux plugin
+ https://github.com/qiime2/q2-demux/issues
+
+- The q2-diversity plugin
+ https://github.com/qiime2/q2-diversity/issues
+
+- The q2-diversity-lib plugin
+ https://github.com/qiime2/q2-diversity-lib/issues
+
+- The q2-emperor plugin
+ https://github.com/qiime2/q2-emperor/issues
+
+- The q2-feature-classifier plugin
+ https://github.com/qiime2/q2-feature-classifier/issues
+
+- The q2-feature-table plugin
+ https://github.com/qiime2/q2-feature-table/issues
+
+- The q2-fragment-insertion plugin
+ https://github.com/qiime2/q2-fragment-insertion/issues
+
+- The q2-gneiss plugin
+ https://github.com/qiime2/q2-gneiss/issues
+
+- The q2-longitudinal plugin
+ https://github.com/qiime2/q2-longitudinal/issues
+
+- The q2-metadata plugin
+ https://github.com/qiime2/q2-metadata/issues
+
+- The q2-phylogeny plugin
+ https://github.com/qiime2/q2-phylogeny/issues
+
+- The q2-quality-control plugin
+ https://github.com/qiime2/q2-quality-control/issues
+
+- The q2-quality-filter plugin
+ https://github.com/qiime2/q2-quality-filter/issues
+
+- The q2-sample-classifier plugin
+ https://github.com/qiime2/q2-sample-classifier/issues
+
+- The q2-shogun plugin
+ https://github.com/qiime2/q2-shogun/issues
+
+- The q2-taxa plugin
+ https://github.com/qiime2/q2-taxa/issues
+
+- The q2-types plugin
+ https://github.com/qiime2/q2-types/issues
+
+- The q2-vsearch plugin
+ https://github.com/qiime2/q2-vsearch/issues
+
+- The CLI interface
+ https://github.com/qiime2/q2cli/issues
+
+- The prototype CWL interface
+ https://github.com/qiime2/q2cwl/issues
+
+- The prototype Galaxy interface
+ https://github.com/qiime2/q2galaxy/issues
+
+- An internal tool for ensuring header text and copyrights are present
+ https://github.com/qiime2/q2lint/issues
+
+- The prototype GUI interface
+ https://github.com/qiime2/q2studio/issues
+
+- A base template for use in official QIIME 2 plugins
+ https://github.com/qiime2/q2templates/issues
+
+- The read-only web interface at view.qiime2.org
+ https://github.com/qiime2/q2view/issues
+
+- The QIIME 2 homepage at qiime2.org
+ https://github.com/qiime2/qiime2.github.io/issues
+
+- The QIIME 2 framework
+ https://github.com/qiime2/qiime2/issues
+
+- Centralized templates for repo assets
+ https://github.com/qiime2/template-repo/issues
+
+- Scripts for building QIIME 2 VMs
+ https://github.com/qiime2/vm-playbooks/issues
+
+- Scripts for building QIIME 2 workshop clusters
+ https://github.com/qiime2/workshop-playbooks/issues
+
+- The web app that runs workshops.qiime2.org
+ https://github.com/qiime2/workshops.qiime2.org/issues
=====================================
.github/SUPPORT.md
=====================================
@@ -0,0 +1,112 @@
+# QIIME 2 Users
+
+Check out the [User Docs](https://docs.qiime2.org) - there are many tutorials,
+walkthroughs, and guides available. If you still need help, please visit us at
+the [QIIME 2 Forum](https://forum.qiime2.org/c/user-support).
+
+# QIIME 2 Developers
+
+Check out the [Developer Docs](https://dev.qiime2.org) - there are many
+tutorials, walkthroughs, and guides available. If you still need help, please
+visit us at the [QIIME 2 Forum](https://forum.qiime2.org/c/dev-discussion).
+
+# General Bug/Issue Triage Discussion
+
+
+
+# Projects/Repositories in the QIIME 2 GitHub Organization
+
+Sorted alphabetically by repo name.
+
+- [busywork](https://github.com/qiime2/busywork/issues)
+ | The CI automation engine that builds and distributes QIIME 2
+- [conda-channel-resource](https://github.com/qiime2/conda-channel-resource/issues)
+ | A Concourse resource for working with conda
+- [data.qiime2.org](https://github.com/qiime2/data.qiime2.org/issues)
+ | Web app for vanity URLs for QIIME 2 data assets
+- [dev-docs](https://github.com/qiime2/dev-docs/issues)
+ | The Developer Documentation
+- [discourse-unhandled-tagger](https://github.com/qiime2/discourse-unhandled-tagger/issues)
+ | A discourse plugin for handling queued/unqueued topics
+- [docs](https://github.com/qiime2/docs/issues)
+ | The User Documentation
+- [environment-files](https://github.com/qiime2/environment-files/issues)
+ | Rendered QIIME 2 environment files for conda
+- [Keemei](https://github.com/qiime2/Keemei/issues)
+ | Google Sheets Add-On for validating tabular data
+- [linux-worker-docker](https://github.com/qiime2/linux-worker-docker/issues)
+ | A docker image for linux-based busywork workers
+- [logos](https://github.com/qiime2/logos/issues)
+ | Official project logos
+- [q2-alignment](https://github.com/qiime2/q2-alignment/issues)
+ | The q2-alignment plugin
+- [q2-composition](https://github.com/qiime2/q2-composition/issues)
+ | The q2-composition plugin
+- [q2-cutadapt](https://github.com/qiime2/q2-cutadapt/issues)
+ | The q2-cutadapt plugin
+- [q2-dada2](https://github.com/qiime2/q2-dada2/issues)
+ | The q2-dada2 plugin
+- [q2-deblur](https://github.com/qiime2/q2-deblur/issues)
+ | The q2-deblur plugin
+- [q2-demux](https://github.com/qiime2/q2-demux/issues)
+ | The q2-demux plugin
+- [q2-diversity](https://github.com/qiime2/q2-diversity/issues)
+ | The q2-diversity plugin
+- [q2-diversity-lib](https://github.com/qiime2/q2-diversity-lib/issues)
+ | The q2-diversity-lib plugin
+- [q2-emperor](https://github.com/qiime2/q2-emperor/issues)
+ | The q2-emperor plugin
+- [q2-feature-classifier](https://github.com/qiime2/q2-feature-classifier/issues)
+ | The q2-feature-classifier plugin
+- [q2-feature-table](https://github.com/qiime2/q2-feature-table/issues)
+ | The q2-feature-table plugin
+- [q2-fragment-insertion](https://github.com/qiime2/q2-fragment-insertion/issues)
+ | The q2-fragment-insertion plugin
+- [q2-gneiss](https://github.com/qiime2/q2-gneiss/issues)
+ | The q2-gneiss plugin
+- [q2-longitudinal](https://github.com/qiime2/q2-longitudinal/issues)
+ | The q2-longitudinal plugin
+- [q2-metadata](https://github.com/qiime2/q2-metadata/issues)
+ | The q2-metadata plugin
+- [q2-phylogeny](https://github.com/qiime2/q2-phylogeny/issues)
+ | The q2-phylogeny plugin
+- [q2-quality-control](https://github.com/qiime2/q2-quality-control/issues)
+ | The q2-quality-control plugin
+- [q2-quality-filter](https://github.com/qiime2/q2-quality-filter/issues)
+ | The q2-quality-filter plugin
+- [q2-sample-classifier](https://github.com/qiime2/q2-sample-classifier/issues)
+ | The q2-sample-classifier plugin
+- [q2-shogun](https://github.com/qiime2/q2-shogun/issues)
+ | The q2-shogun plugin
+- [q2-taxa](https://github.com/qiime2/q2-taxa/issues)
+ | The q2-taxa plugin
+- [q2-types](https://github.com/qiime2/q2-types/issues)
+ | The q2-types plugin
+- [q2-vsearch](https://github.com/qiime2/q2-vsearch/issues)
+ | The q2-vsearch plugin
+- [q2cli](https://github.com/qiime2/q2cli/issues)
+ | The CLI interface
+- [q2cwl](https://github.com/qiime2/q2cwl/issues)
+ | The prototype CWL interface
+- [q2galaxy](https://github.com/qiime2/q2galaxy/issues)
+ | The prototype Galaxy interface
+- [q2lint](https://github.com/qiime2/q2lint/issues)
+ | An internal tool for ensuring header text and copyrights are present
+- [q2studio](https://github.com/qiime2/q2studio/issues)
+ | The prototype GUI interface
+- [q2templates](https://github.com/qiime2/q2templates/issues)
+ | A base template for use in official QIIME 2 plugins
+- [q2view](https://github.com/qiime2/q2view/issues)
+ | The read-only web interface at view.qiime2.org
+- [qiime2.github.io](https://github.com/qiime2/qiime2.github.io/issues)
+ | The QIIME 2 homepage at qiime2.org
+- [qiime2](https://github.com/qiime2/qiime2/issues)
+ | The QIIME 2 framework
+- [template-repo](https://github.com/qiime2/template-repo/issues)
+ | Centralized templates for repo assets
+- [vm-playbooks](https://github.com/qiime2/vm-playbooks/issues)
+ | Scripts for building QIIME 2 VMs
+- [workshop-playbooks](https://github.com/qiime2/workshop-playbooks/issues)
+ | Scripts for building QIIME 2 workshop clusters
+- [workshops.qiime2.org](https://github.com/qiime2/workshops.qiime2.org/issues)
+ | The web app that runs workshops.qiime2.org
=====================================
.github/pull_request_template.md
=====================================
@@ -0,0 +1,11 @@
+Brief summary of the Pull Request, including any issues it may fix using the GitHub closing syntax:
+
+https://help.github.com/articles/closing-issues-using-keywords/
+
+Also, include any co-authors or contributors using the GitHub coauthor tag:
+
+https://help.github.com/articles/creating-a-commit-with-multiple-authors/
+
+---
+
+Include any questions for reviewers, screenshots, sample outputs, etc.
=====================================
.github/rubric.png
=====================================
Binary files /dev/null and b/.github/rubric.png differ
=====================================
.github/workflows/add-to-project-ci.yml
=====================================
@@ -0,0 +1,21 @@
+name: Add new issues and PRs to triage project board
+
+on:
+ issues:
+ types:
+ - opened
+ pull_request_target:
+ types:
+ - opened
+
+jobs:
+ add-to-project:
+ name: Add issue to project
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/add-to-project at v0.3.0
+ with:
+ project-url: https://github.com/orgs/qiime2/projects/36
+ github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+ labeled: skip-triage
+ label-operator: NOT
=====================================
.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: q2-emperor
+ build-target: dev
+ additional-tests: py.test --pyargs q2_emperor
+ library-token: ${{ secrets.LIBRARY_TOKEN }}
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+q2-emperor (2022.11.1-1) experimental; urgency=medium
+
+ * Team upload.
+ * New upstream version
+ * Bump versioned Depends
+ * Standards-Version: 4.6.2 (routine-update)
+ * Delay build-time test since registration in qiime2 can't be done
+ at that point in time
+
+ -- Andreas Tille <tille at debian.org> Fri, 13 Jan 2023 06:58:57 +0100
+
q2-emperor (2022.8.0-1) unstable; urgency=medium
* Team Upload.
=====================================
debian/control
=====================================
@@ -10,10 +10,10 @@ Build-Depends: debhelper-compat (= 13),
python3-pytest <!nocheck>,
python3-pytest-cov <!nocheck>,
python3-emperor <!nocheck>,
- qiime (>= 2022.8.1) <!nocheck>,
- q2templates (>= 2022.8.0) <!nocheck>,
- q2-types (>= 2022.8.0) <!nocheck>
-Standards-Version: 4.6.1
+ qiime (>= 2022.11.1) <!nocheck>,
+ q2templates (>= 2022.11.1) <!nocheck>,
+ q2-types (>= 2022.11.1) <!nocheck>
+Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/med-team/q2-emperor
Vcs-Git: https://salsa.debian.org/med-team/q2-emperor.git
Homepage: https://qiime2.org/
@@ -27,9 +27,9 @@ Depends: ${shlibs:Depends},
python3-pandas,
python3-emperor,
python3-distutils,
- q2templates (>= 2022.8.0),
- q2-types (>= 2022.8.0),
- qiime (>= 2022.8.1)
+ q2templates (>= 2022.11.1),
+ q2-types (>= 2022.11.1),
+ qiime (>= 2022.11.1)
Description: QIIME2 plugin for display of ordination plots
QIIME 2 is a powerful, extensible, and decentralized microbiome analysis
package with a focus on data and analysis transparency. QIIME 2 enables
=====================================
debian/copyright
=====================================
@@ -6,7 +6,7 @@ Files: *
Copyright: 2016-2020 QIIME 2 development team
License: BSD-3-clause
-Files: versioneer.py q2_emperor/_version.py
+Files: versioneer.py
Copyright: Brian Warner
License: CC0-1.0
From the README.md:
@@ -48,26 +48,6 @@ License: BSD-3-clause
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.
-License: GPL-2+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- .
- For other licensing arrangements, please contact Daniel J. Schaid.
- .
- On a Debian system, the GNU GPL license version 2 is distributed in the
- file /usr/share/common-licenses/GPL-2.
-
License: CC0-1.0
From https://creativecommons.org/publicdomain/zero/1.0/
.
=====================================
debian/rules
=====================================
@@ -13,9 +13,11 @@ export PYBUILD_BEFORE_INSTALL=rm -rvf {build_dir}/q2-emperor.egg-* \
%:
dh $@ --with python3 --buildsystem=pybuild
+#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}; py.test-3 --cov=q2_emperor"
+ dh_auto_test -- -s custom --test-args="cd {build_dir}; py.test-3 --cov=q2_emperor" || true
endif
override_dh_auto_clean:
=====================================
q2_emperor/_examples.py
=====================================
@@ -0,0 +1,59 @@
+# ----------------------------------------------------------------------------
+# Copyright (c) 2016-2022, QIIME 2 development team.
+#
+# Distributed under the terms of the Modified BSD License.
+#
+# The full license is in the file LICENSE, distributed with this software.
+# ----------------------------------------------------------------------------
+import qiime2
+
+bc_pcoa_results_url = ('https://data.qiime2.org/usage-examples/'
+ 'moving-pictures/core-metrics-results/'
+ 'bray_curtis_pcoa_results.qza')
+unweighted_pcoa_results_url = ('https://data.qiime2.org/usage-examples/'
+ 'moving-pictures/core-metrics-results/'
+ 'unweighted_unifrac_pcoa_results.qza')
+
+metadata_url = (f'https://data.qiime2.org/{qiime2.__release__}/tutorials/'
+ 'moving-pictures/sample_metadata.tsv')
+
+
+def plot(use):
+ pcoa_results = use.init_artifact_from_url('pcoa_result',
+ bc_pcoa_results_url)
+ metadata = use.init_metadata_from_url('sample_metadata', metadata_url)
+
+ viz, = use.action(
+ use.UsageAction('emperor', 'plot'),
+ use.UsageInputs(
+ pcoa=pcoa_results,
+ metadata=metadata
+ ),
+ use.UsageOutputNames(
+ visualization='plot'
+ )
+ )
+
+ viz.assert_output_type('Visualization')
+
+
+def procrustes_plot(use):
+ bc_pcoa_results = use.init_artifact_from_url('bc_pcoa_result',
+ bc_pcoa_results_url)
+ unw_pcoa_results = use.init_artifact_from_url('unw_pcoa_result',
+ unweighted_pcoa_results_url)
+ metadata = use.init_metadata_from_url('sample_metadata', metadata_url)
+
+ viz, = use.action(
+ use.UsageAction('emperor', 'procrustes_plot'),
+ use.UsageInputs(
+ reference_pcoa=bc_pcoa_results,
+ other_pcoa=unw_pcoa_results,
+ metadata=metadata
+ ),
+ use.UsageOutputNames(
+ visualization='plot'
+ )
+ )
+
+ viz.assert_output_type('Visualization')
=====================================
q2_emperor/_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: 2022.8.0)"
- git_full = "38adee08e1506220d8c13c604e4a9f0db6c21fdf"
- git_date = "2022-08-23 16:28:56 +0000"
+ git_refnames = " (HEAD -> master, tag: 2022.11.1)"
+ git_full = "9939a581e45458e9cb66f4b4a477547ade28bc67"
+ git_date = "2022-12-21 21:56:47 +0000"
keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
return keywords
=====================================
q2_emperor/plugin_setup.py
=====================================
@@ -13,6 +13,7 @@ from ._plot import plot, procrustes_plot, biplot
from qiime2.plugin import (Plugin, Metadata, Str, List, Citations, Range, Int,
Bool, Properties)
from q2_types.ordination import PCoAResults, ProcrustesStatistics
+import q2_emperor._examples as ex
PARAMETERS = {'metadata': Metadata, 'custom_axes': List[Str],
'ignore_missing_samples': Bool}
@@ -67,7 +68,8 @@ plugin.visualizers.register_function(
parameter_descriptions=PLOT_PARAMETERS_DESC,
name='Visualize and Interact with Principal Coordinates Analysis Plots',
description='Generates an interactive ordination plot where the user '
- 'can visually integrate sample metadata.'
+ 'can visually integrate sample metadata.',
+ examples={'emperor_plot': ex.plot}
)
plugin.visualizers.register_function(
@@ -84,7 +86,8 @@ plugin.visualizers.register_function(
},
parameter_descriptions=PARAMETERS_DESC,
name='Visualize and Interact with a procrustes plot',
- description='Plot two procrustes-fitted matrices'
+ description='Plot two procrustes-fitted matrices',
+ examples={'procrustes_plot': ex.procrustes_plot}
)
plugin.visualizers.register_function(
=====================================
q2_emperor/tests/test_plot.py
=====================================
@@ -17,6 +17,15 @@ import skbio
from q2_emperor import plot, procrustes_plot, biplot, generic_plot
+from qiime2.plugin.testing import TestPluginBase
+
+
+class TestBase(TestPluginBase):
+ package = 'q2_emperor.tests'
+
+ def test_examples(self):
+ self.execute_examples()
+
class PlotTests(unittest.TestCase):
def setUp(self):
View it on GitLab: https://salsa.debian.org/med-team/q2-emperor/-/compare/d6a856036f2186646e4ab5bc8fdbd7d5ff2bc375...6af77f5e814b09abb2b11ad41dd8c03148672d9e
--
View it on GitLab: https://salsa.debian.org/med-team/q2-emperor/-/compare/d6a856036f2186646e4ab5bc8fdbd7d5ff2bc375...6af77f5e814b09abb2b11ad41dd8c03148672d9e
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/20230113/a1dd08d6/attachment-0001.htm>
More information about the debian-med-commit
mailing list