[med-svn] [Git][med-team/q2-emperor][master] 7 commits: New upstream version 2023.7.0
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Sun Aug 20 14:52:20 BST 2023
Étienne Mollier pushed to branch master at Debian Med / q2-emperor
Commits:
f4fdd635 by Étienne Mollier at 2023-08-20T14:42:44+02:00
New upstream version 2023.7.0
- - - - -
ca885d9f by Étienne Mollier at 2023-08-20T14:42:44+02:00
routine-update: New upstream version
- - - - -
40cb1666 by Étienne Mollier at 2023-08-20T14:42:45+02:00
Update upstream source from tag 'upstream/2023.7.0'
Update to upstream version '2023.7.0'
with Debian dir 506c94c71d334b14dc2c0a01cdb8139063865b05
- - - - -
43aa2946 by Étienne Mollier at 2023-08-20T15:49:29+02:00
skip-test-needing-internet.patch: new.
- - - - -
d1128901 by Étienne Mollier at 2023-08-20T15:50:25+02:00
d/copyright: bump copyright year.
- - - - -
a562287f by Étienne Mollier at 2023-08-20T15:51:03+02:00
d/control: add myself to uploaders.
- - - - -
14d4c537 by Étienne Mollier at 2023-08-20T15:51:47+02:00
ready to upload to unstable.
- - - - -
20 changed files:
- + .github/workflows/ci-dev.yaml
- − .github/workflows/ci.yml
- + .github/workflows/join-release.yaml
- + .github/workflows/tag-release.yaml
- LICENSE
- ci/recipe/meta.yaml
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/series
- + debian/patches/skip-test-needing-internet.patch
- q2_emperor/__init__.py
- q2_emperor/_examples.py
- q2_emperor/_plot.py
- q2_emperor/_version.py
- q2_emperor/plugin_setup.py
- q2_emperor/tests/__init__.py
- q2_emperor/tests/test_plot.py
- q2_emperor/tests/test_plugin_setup.py
- setup.py
Changes:
=====================================
.github/workflows/ci-dev.yaml
=====================================
@@ -0,0 +1,12 @@
+# Example of workflow trigger for calling workflow (the client).
+name: ci-dev
+on:
+ pull_request:
+ branches: ["dev"]
+ push:
+ branches: ["dev"]
+jobs:
+ ci:
+ uses: qiime2/distributions/.github/workflows/lib-ci-dev.yaml at dev
+ with:
+ distro: core
\ No newline at end of file
=====================================
.github/workflows/ci.yml deleted
=====================================
@@ -1,55 +0,0 @@
-# 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 }}
=====================================
.github/workflows/join-release.yaml
=====================================
@@ -0,0 +1,6 @@
+name: join-release
+on:
+ workflow_dispatch: {}
+jobs:
+ release:
+ uses: qiime2/distributions/.github/workflows/lib-join-release.yaml at dev
\ No newline at end of file
=====================================
.github/workflows/tag-release.yaml
=====================================
@@ -0,0 +1,7 @@
+name: tag-release
+on:
+ push:
+ branches: ["Release-*"]
+jobs:
+ tag:
+ uses: qiime2/distributions/.github/workflows/lib-tag-release.yaml at dev
\ No newline at end of file
=====================================
LICENSE
=====================================
@@ -1,6 +1,6 @@
BSD 3-Clause License
-Copyright (c) 2016-2022, QIIME 2 development team.
+Copyright (c) 2016-2023, QIIME 2 development team.
All rights reserved.
Redistribution and use in source and binary forms, with or without
=====================================
ci/recipe/meta.yaml
=====================================
@@ -37,6 +37,9 @@ test:
- q2_emperor
- qiime2.plugins.emperor
+ commands:
+ - py.test --pyargs q2_emperor
+
about:
home: https://qiime2.org
license: BSD-3-Clause
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+q2-emperor (2023.7.0-1) unstable; urgency=medium
+
+ * New upstream version 2023.7.0
+ * skip-test-needing-internet.patch: new.
+ * d/copyright: bump copyright year.
+ * d/control: add myself to uploaders.
+
+ -- Étienne Mollier <emollier at debian.org> Sun, 20 Aug 2023 15:51:33 +0200
+
q2-emperor (2022.11.1-2) unstable; urgency=medium
* Team upload
=====================================
debian/control
=====================================
@@ -1,6 +1,7 @@
Source: q2-emperor
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Steffen Moeller <moeller at debian.org>
+Uploaders: Steffen Moeller <moeller at debian.org>,
+ Étienne Mollier <emollier at debian.org>
Section: science
Priority: optional
Build-Depends: debhelper-compat (= 13),
=====================================
debian/copyright
=====================================
@@ -3,7 +3,7 @@ Upstream-Name: QIIME 2
Source: https://github.com/qiime2/q2-emperor
Files: *
-Copyright: 2016-2020 QIIME 2 development team
+Copyright: 2016-2023 QIIME 2 development team
License: BSD-3-clause
Files: versioneer.py
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+skip-test-needing-internet.patch
=====================================
debian/patches/skip-test-needing-internet.patch
=====================================
@@ -0,0 +1,18 @@
+--- q2-emperor.orig/q2_emperor/tests/test_plot.py
++++ q2-emperor/q2_emperor/tests/test_plot.py
+@@ -9,6 +9,7 @@
+ import os
+ import tempfile
+ import unittest
++import pytest
+
+ import pandas as pd
+ import numpy as np
+@@ -20,6 +21,7 @@
+ from qiime2.plugin.testing import TestPluginBase
+
+
++ at pytest.mark.skip(reason='Test needs Internet')
+ class TestBase(TestPluginBase):
+ package = 'q2_emperor.tests'
+
=====================================
q2_emperor/__init__.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
=====================================
q2_emperor/_examples.py
=====================================
@@ -1,11 +1,10 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, 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/'
@@ -14,8 +13,8 @@ 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')
+metadata_url = ('https://data.qiime2.org/usage-examples/'
+ 'moving-pictures/sample-metadata.tsv')
def plot(use):
=====================================
q2_emperor/_plot.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
=====================================
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 = " (HEAD -> master, tag: 2022.11.1)"
- git_full = "9939a581e45458e9cb66f4b4a477547ade28bc67"
- git_date = "2022-12-21 21:56:47 +0000"
+ git_refnames = " (tag: 2023.7.0, Release-2023.7)"
+ git_full = "13b5dd0492ac2dfd69dd90f746028ae4f3641021"
+ git_date = "2023-08-17 18:42:00 +0000"
keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
return keywords
=====================================
q2_emperor/plugin_setup.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
=====================================
q2_emperor/tests/__init__.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
=====================================
q2_emperor/tests/test_plot.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
=====================================
q2_emperor/tests/test_plugin_setup.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
=====================================
setup.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2016-2022, QIIME 2 development team.
+# Copyright (c) 2016-2023, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
View it on GitLab: https://salsa.debian.org/med-team/q2-emperor/-/compare/9992f23bfb20d621aa7214f658e05e7802459651...14d4c53752e65e949c84b1e2bed2d39675723338
--
View it on GitLab: https://salsa.debian.org/med-team/q2-emperor/-/compare/9992f23bfb20d621aa7214f658e05e7802459651...14d4c53752e65e949c84b1e2bed2d39675723338
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/20230820/ed0784be/attachment-0001.htm>
More information about the debian-med-commit
mailing list