[med-svn] [Git][med-team/q2-diversity-lib][master] 6 commits: routine-update: New upstream version
Steffen Möller (@moeller)
gitlab at salsa.debian.org
Tue Sep 21 15:08:21 BST 2021
Steffen Möller pushed to branch master at Debian Med / q2-diversity-lib
Commits:
a4b45e8a by Steffen at 2021-09-19T00:48:58+02:00
routine-update: New upstream version
- - - - -
06c25edf by Steffen at 2021-09-19T00:48:59+02:00
New upstream version 2021.8.0
- - - - -
cf9084a8 by Steffen at 2021-09-19T00:49:02+02:00
Update upstream source from tag 'upstream/2021.8.0'
Update to upstream version '2021.8.0'
with Debian dir fa730c18bfd8ce33292f7307ba7e1ec2b7e6b8ad
- - - - -
98a9cc0c by Steffen at 2021-09-19T00:49:02+02:00
routine-update: Standards-Version: 4.6.0
- - - - -
68efe220 by Steffen at 2021-09-19T00:52:06+02:00
routine-update: Ready to upload to unstable
- - - - -
e162005c by Steffen at 2021-09-21T16:08:01+02:00
Merge branch 'master' of salsa.debian.org:med-team/q2-diversity-lib
- - - - -
18 changed files:
- .github/workflows/lint-build-test.yml → .github/workflows/ci.yml
- LICENSE
- README.md
- − ci/recipe/conda_build_config.yaml
- ci/recipe/meta.yaml
- debian/changelog
- debian/control
- q2_diversity_lib/__init__.py
- q2_diversity_lib/_util.py
- q2_diversity_lib/_version.py
- q2_diversity_lib/alpha.py
- q2_diversity_lib/beta.py
- q2_diversity_lib/plugin_setup.py
- q2_diversity_lib/tests/__init__.py
- q2_diversity_lib/tests/test_alpha.py
- q2_diversity_lib/tests/test_beta.py
- q2_diversity_lib/tests/test_util.py
- setup.py
Changes:
=====================================
.github/workflows/lint-build-test.yml → .github/workflows/ci.yml
=====================================
@@ -1,5 +1,9 @@
-name: lint-build-test
-# build on every PR and commit to master
+# 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:
@@ -10,13 +14,17 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout at v2
- - name: set up python 3.6
+ - name: checkout source
+ uses: actions/checkout at v2
+
+ - name: set up python 3.8
uses: actions/setup-python at v1
with:
- python-version: 3.6
+ 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
@@ -31,13 +39,17 @@ jobs:
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- - uses: actions/checkout at v2
+ - name: checkout source
+ uses: actions/checkout at v2
with:
fetch-depth: 0
- # for versioneer
- - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+
+ - 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-diversity-lib
- build-target: staging
- additional-tests: pytest --pyargs q2_diversity_lib --capture=tee-sys
+ build-target: dev
+ additional-tests: py.test --pyargs q2_diversity_lib
+ library-token: ${{ secrets.LIBRARY_TOKEN }}
=====================================
LICENSE
=====================================
@@ -1,6 +1,6 @@
BSD 3-Clause License
-Copyright (c) 2018-2020, QIIME 2 development team.
+Copyright (c) 2018-2021, QIIME 2 development team.
All rights reserved.
Redistribution and use in source and binary forms, with or without
=====================================
README.md
=====================================
@@ -1,6 +1,5 @@
# q2-diversity-lib
-
-[](https://coveralls.io/github/qiime2/q2-diversity-lib?branch=master)
+
-This is a QIIME 2 plugin. For details on QIIME 2, see https://qiime2.org..
+This is a QIIME 2 plugin. For details on QIIME 2, see https://qiime2.org..
\ No newline at end of file
=====================================
ci/recipe/conda_build_config.yaml deleted
=====================================
@@ -1,2 +0,0 @@
-python:
- - 3.6
=====================================
ci/recipe/meta.yaml
=====================================
@@ -1,6 +1,5 @@
{% set data = load_setup_py_data() %}
{% set version = data.get('version') or 'placehold' %}
-{% set release = '.'.join(version.split('.')[:2]) %}
package:
name: q2-diversity-lib
@@ -18,18 +17,26 @@ requirements:
- setuptools
run:
+ - python {{ python }}
- biom-format >=2.1.5,<2.2.0
- decorator
+ # Inherit global hard pin
+ - hdf5 {{ hdf5 }}
- numpy
- pandas
- psutil
- - qiime2 {{ release }}.*
- - q2-types {{ release }}.*
+ - qiime2 {{ qiime2_epoch }}.*
+ - q2-types {{ qiime2_epoch }}.*
- scikit-bio
- scipy
- unifrac >=0.20.0
test:
+ requires:
+ - qiime2 >={{ qiime2 }}
+ - q2-types >={{ q2_types }}
+ - pytest
+
imports:
- q2_diversity_lib
- qiime2.plugins.diversity_lib
=====================================
debian/changelog
=====================================
@@ -1,5 +1,7 @@
-q2-diversity-lib (2020.11.1-1) UNRELEASED; urgency=medium
+q2-diversity-lib (2021.8.0-1) UNRELEASED; urgency=medium
* Initial release (Closes: #992104).
+ * New upstream version
+ * Standards-Version: 4.6.0 (routine-update)
- -- Steffen Moeller <moeller at debian.org> Wed, 11 Aug 2021 19:51:15 +0200
+ -- Steffen Moeller <moeller at debian.org> Sun, 19 Sep 2021 00:50:18 +0200
=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 13),
python3-statsmodels <!nocheck>,
python3-unifrac <!nocheck>,
qiime (>= 2019.10.0) <!nocheck>
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/med-team/q2-diversity-lib
Vcs-Git: https://salsa.debian.org/med-team/q2-diversity-lib.git
Homepage: https://qiime2.org/
=====================================
q2_diversity_lib/__init__.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2018-2020, QIIME 2 development team.
+# Copyright (c) 2018-2021, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
=====================================
q2_diversity_lib/_util.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2018-2020, QIIME 2 development team.
+# Copyright (c) 2018-2021, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
=====================================
q2_diversity_lib/_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 = "1867d88619465a0c9501477ab2c43d640bab55df"
- git_date = "2020-12-05 20:44:45 +0000"
+ git_refnames = " (tag: 2021.8.0)"
+ git_full = "9c30351a4ce12d4eccb94158cd808faced68fe0d"
+ git_date = "2021-09-09 18:35:28 +0000"
keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
return keywords
=====================================
q2_diversity_lib/alpha.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2018-2020, QIIME 2 development team.
+# Copyright (c) 2018-2021, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
=====================================
q2_diversity_lib/beta.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2018-2020, QIIME 2 development team.
+# Copyright (c) 2018-2021, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
=====================================
q2_diversity_lib/plugin_setup.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2018-2020, QIIME 2 development team.
+# Copyright (c) 2018-2021, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
=====================================
q2_diversity_lib/tests/__init__.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2018-2020, QIIME 2 development team.
+# Copyright (c) 2018-2021, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
=====================================
q2_diversity_lib/tests/test_alpha.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2018-2020, QIIME 2 development team.
+# Copyright (c) 2018-2021, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
@@ -8,7 +8,7 @@
import numpy as np
import pandas as pd
-import pandas.util.testing as pdt
+import pandas.testing as pdt
import biom
from qiime2.plugin.testing import TestPluginBase
=====================================
q2_diversity_lib/tests/test_beta.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2018-2020, QIIME 2 development team.
+# Copyright (c) 2018-2021, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
=====================================
q2_diversity_lib/tests/test_util.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2018-2020, QIIME 2 development team.
+# Copyright (c) 2018-2021, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
=====================================
setup.py
=====================================
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
-# Copyright (c) 2018-2020, QIIME 2 development team.
+# Copyright (c) 2018-2021, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
View it on GitLab: https://salsa.debian.org/med-team/q2-diversity-lib/-/compare/1ed05315a6dfa76aa3b1b9877a8e6c612662027b...e162005c922c9d889be277dc037e10cfa3c2e1fd
--
View it on GitLab: https://salsa.debian.org/med-team/q2-diversity-lib/-/compare/1ed05315a6dfa76aa3b1b9877a8e6c612662027b...e162005c922c9d889be277dc037e10cfa3c2e1fd
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/20210921/e6f74c23/attachment-0001.htm>
More information about the debian-med-commit
mailing list