[med-svn] [Git][med-team/ctdopts][master] 8 commits: Fix watchfile to detect new versions on github
Andreas Tille (@tille)
gitlab at salsa.debian.org
Mon Oct 18 17:12:42 BST 2021
Andreas Tille pushed to branch master at Debian Med / ctdopts
Commits:
7e5ba088 by Andreas Tille at 2021-10-18T15:37:11+02:00
Fix watchfile to detect new versions on github
- - - - -
a98d4f01 by Andreas Tille at 2021-10-18T15:37:14+02:00
New upstream version 1.5
- - - - -
2b758590 by Andreas Tille at 2021-10-18T15:37:14+02:00
routine-update: New upstream version
- - - - -
fd3f2896 by Andreas Tille at 2021-10-18T15:37:14+02:00
Update upstream source from tag 'upstream/1.5'
Update to upstream version '1.5'
with Debian dir b6effd1e1c90d58366eca9fb7b17a878c834b399
- - - - -
b0b6e14f by Andreas Tille at 2021-10-18T15:37:14+02:00
routine-update: Standards-Version: 4.6.0
- - - - -
509af411 by Andreas Tille at 2021-10-18T15:38:25+02:00
Update patches
- - - - -
4989eb7b by Andreas Tille at 2021-10-18T15:50:45+02:00
Remove all patches
- - - - -
26c6fa1f by Andreas Tille at 2021-10-18T15:51:39+02:00
Upload to unstable
- - - - -
9 changed files:
- CTDopts/CTDopts.py
- debian/changelog
- debian/control
- − debian/patches/2to3
- − debian/patches/bc082bd2e20c81fdf33cf96f8241f6cce68f2f8d.patch
- − debian/patches/series
- debian/watch
- dist/conda/meta.yaml
- setup.py
Changes:
=====================================
CTDopts/CTDopts.py
=====================================
@@ -1222,8 +1222,9 @@ def args_from_file(filename):
if 'value' in element.attrib:
base[element.attrib['name']] = element.attrib['value']
elif element.tag == 'ITEMLIST':
- if element.getchildren():
- base[element.attrib['name']] = [listitem.attrib['value'] for listitem in element]
+ items = list(element)
+ if items:
+ base[element.attrib['name']] = [listitem.attrib['value'] for listitem in items]
root = parse(filename).getroot()
param_root = root if root.tag == 'PARAMETERS' else root.find('PARAMETERS')
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+ctdopts (1.5-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream version
+ * Standards-Version: 4.6.0 (routine-update)
+
+ -- Andreas Tille <tille at debian.org> Mon, 18 Oct 2021 15:50:56 +0200
+
+ctdopts (1.4-3) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Fix watchfile to detect new versions on github
+
+ -- Andreas Tille <tille at debian.org> Mon, 18 Oct 2021 15:37:11 +0200
+
ctdopts (1.4-2) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13),
python3-setuptools,
2to3,
python3-tz
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/med-team/ctdopts
Vcs-Git: https://salsa.debian.org/med-team/ctdopts.git
Homepage: https://github.com/WorkflowConversion/CTDopts
=====================================
debian/patches/2to3 deleted
=====================================
@@ -1,18 +0,0 @@
-Author: Michael R. Crusoe <michael.crusoe at gmail.com>
-Description: Run 2to3 as part of setup
---- ctdopts.orig/setup.py
-+++ ctdopts/setup.py
-@@ -1,4 +1,4 @@
--from distutils.core import setup
-+from setuptools import setup
-
- setup(
- name='CTDopts',
-@@ -9,5 +9,7 @@
- author='Andras Szolek',
- author_email='',
- py_modules=['CTDopts/CTDopts'],
-+ install_requires=['pytz'],
-+ use_2to3=True,
- description='A module for enabling tools with CTD reading/writing, argument parsing, validating and manipulating capabilities.'
- )
=====================================
debian/patches/bc082bd2e20c81fdf33cf96f8241f6cce68f2f8d.patch deleted
=====================================
@@ -1,25 +0,0 @@
-From bc082bd2e20c81fdf33cf96f8241f6cce68f2f8d Mon Sep 17 00:00:00 2001
-From: Michael Hudson-Doyle <michael.hudson at canonical.com>
-Date: Tue, 20 Oct 2020 12:44:24 +1300
-Subject: [PATCH] do not use getchildren, removed in python 3.9
-
----
- CTDopts/CTDopts.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/CTDopts/CTDopts.py b/CTDopts/CTDopts.py
-index e8970e1..c941811 100644
---- a/CTDopts/CTDopts.py
-+++ b/CTDopts/CTDopts.py
-@@ -1222,8 +1222,9 @@ def get_args(element, base=None):
- if 'value' in element.attrib:
- base[element.attrib['name']] = element.attrib['value']
- elif element.tag == 'ITEMLIST':
-- if element.getchildren():
-- base[element.attrib['name']] = [listitem.attrib['value'] for listitem in element]
-+ items = list(element)
-+ if items:
-+ base[element.attrib['name']] = [listitem.attrib['value'] for listitem in items]
-
- root = parse(filename).getroot()
- param_root = root if root.tag == 'PARAMETERS' else root.find('PARAMETERS')
=====================================
debian/patches/series deleted
=====================================
@@ -1,2 +0,0 @@
-2to3
-bc082bd2e20c81fdf33cf96f8241f6cce68f2f8d.patch
=====================================
debian/watch
=====================================
@@ -1,7 +1,7 @@
version=4
# Uncomment to find new files on Github
# - when using releases:
-https://github.com/WorkflowConversion/CTDopts/releases .*/archive/v?@ANY_VERSION@@ARCHIVE_EXT@
+https://github.com/WorkflowConversion/CTDopts/releases .*/v?@ANY_VERSION@@ARCHIVE_EXT@
# - when using tags
# https://github.com/#GITHUBUSER#/#PACKAGE#/tags .*/#PREFIX#@ANY_VERSION@@ARCHIVE_EXT@
# Remark: frequently you can do s/#PREFIX#/v?/ since 'v' or nothing is quite common but there are other prefixes possible
=====================================
dist/conda/meta.yaml
=====================================
@@ -1,9 +1,9 @@
package:
name: ctdopts
- version: "1.4"
+ version: "1.5"
source:
- git_rev: v1.4
+ git_rev: v1.5
git_url: https://github.com/WorkflowConversion/CTDopts.git
build:
=====================================
setup.py
=====================================
@@ -2,7 +2,7 @@ from distutils.core import setup
setup(
name='CTDopts',
- version='1.4',
+ version='1.5',
packages=['CTDopts'],
url='https://github.com/genericworkflownodes/CTDopts',
license='',
View it on GitLab: https://salsa.debian.org/med-team/ctdopts/-/compare/5174a893e165d3c986b04d9aa96f7856ad99c207...26c6fa1fe3eb7b8d03638e0ebe52bf92a610756f
--
View it on GitLab: https://salsa.debian.org/med-team/ctdopts/-/compare/5174a893e165d3c986b04d9aa96f7856ad99c207...26c6fa1fe3eb7b8d03638e0ebe52bf92a610756f
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/20211018/43f18182/attachment-0001.htm>
More information about the debian-med-commit
mailing list