[med-svn] [Git][med-team/cwltest][master] 6 commits: routine-update: New upstream version
Michael R. Crusoe (@crusoe)
gitlab at salsa.debian.org
Fri Aug 25 14:30:09 BST 2023
Michael R. Crusoe pushed to branch master at Debian Med / cwltest
Commits:
43dc03ee by Michael R. Crusoe at 2023-08-25T15:11:28+02:00
routine-update: New upstream version
- - - - -
be71ddbb by Michael R. Crusoe at 2023-08-25T15:11:29+02:00
New upstream version 2.3.20230825125225
- - - - -
75984725 by Michael R. Crusoe at 2023-08-25T15:11:29+02:00
Update upstream source from tag 'upstream/2.3.20230825125225'
Update to upstream version '2.3.20230825125225'
with Debian dir 859418237d1f2b24c2bd31ed693c73d1bb6ebfad
- - - - -
9cdbb2cf by Michael R. Crusoe at 2023-08-25T15:11:35+02:00
routine-update: Build-Depends: s/dh-python/dh-sequence-python3/
- - - - -
7536e793 by Michael R. Crusoe at 2023-08-25T15:20:21+02:00
remove patch, it was applied upstream.
- - - - -
ddfaf5a6 by Michael R. Crusoe at 2023-08-25T15:21:14+02:00
routine-update: Ready to upload to unstable
- - - - -
14 changed files:
- PKG-INFO
- cwltest.egg-info/PKG-INFO
- debian/changelog
- debian/control
- − debian/patches/series
- − debian/patches/test_paths
- debian/rules
- dev-requirements.txt
- docs/requirements.txt
- mypy-requirements.txt
- setup.cfg
- setup.py
- tests/test_categories.py
- tox.ini
Changes:
=====================================
PKG-INFO
=====================================
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: cwltest
-Version: 2.3.20230607140609
+Version: 2.3.20230825125225
Summary: Common Workflow Language testing framework
Home-page: https://github.com/common-workflow-language/cwltest
Download-URL: https://github.com/common-workflow-language/cwltest
@@ -13,11 +13,11 @@ Classifier: Operating System :: POSIX
Classifier: Operating System :: MacOS :: MacOS X
Classifier: Development Status :: 5 - Production/Stable
Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: 3.10
Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
Classifier: Typing :: Typed
Requires-Python: >=3.6, <4
Description-Content-Type: text/x-rst
=====================================
cwltest.egg-info/PKG-INFO
=====================================
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: cwltest
-Version: 2.3.20230607140609
+Version: 2.3.20230825125225
Summary: Common Workflow Language testing framework
Home-page: https://github.com/common-workflow-language/cwltest
Download-URL: https://github.com/common-workflow-language/cwltest
@@ -13,11 +13,11 @@ Classifier: Operating System :: POSIX
Classifier: Operating System :: MacOS :: MacOS X
Classifier: Development Status :: 5 - Production/Stable
Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: 3.10
Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
Classifier: Typing :: Typed
Requires-Python: >=3.6, <4
Description-Content-Type: text/x-rst
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+cwltest (2.3.20230825125225-1) unstable; urgency=medium
+
+ * New upstream version
+ * Build-Depends: s/dh-python/dh-sequence-python3/ (routine-update)
+ * remove patch, it was applied upstream.
+
+ -- Michael R. Crusoe <crusoe at debian.org> Fri, 25 Aug 2023 15:21:14 +0200
+
cwltest (2.3.20230607140609-1) experimental; urgency=medium
* Initial release. (Closes: #1037201)
=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Michael R. Crusoe <crusoe at debian.org>
Section: science
Priority: optional
Build-Depends: debhelper-compat (= 13),
- dh-python,
+ dh-sequence-python3,
python3,
python3-all,
pybuild-plugin-pyproject,
=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-test_paths
=====================================
debian/patches/test_paths deleted
=====================================
@@ -1,59 +0,0 @@
-From: Michael R. Crusoe <crusoe at debian.org>
-Subject: test_catories path fixes
-Origin: upstream,https://github.com/common-workflow-language/cwltest/commit/0f9117efaa811494135983f732bf55266d4b4ccb
-
---- a/tests/test_categories.py
-+++ b/tests/test_categories.py
-@@ -14,15 +14,10 @@
-
- def test_unsupported_with_required_tests() -> None:
- cwl_runner = get_data("tests/test-data/mock_cwl_runner.py")
-- args = [
-- "--test",
-- schema_salad.ref_resolver.file_uri(
-- get_data("tests/test-data/required-unsupported.yml")
-- ),
-- ]
- cwd = os.getcwd()
-+ os.chdir(get_data("tests/test-data/"))
-+ args = ["--test", "required-unsupported.yml"]
- try:
-- os.chdir(get_data("tests/test-data/"))
- error_code, stdout, stderr = run_with_mock_cwl_runner(args)
- finally:
- os.chdir(cwd)
-@@ -35,21 +30,19 @@ def test_unsupported_with_required_tests() -> None:
- else:
- q = ""
- assert (
-- "The `id` field is missing.{n}"
-- "The `id` field is missing.{n}"
-- "Test [1/2] Required test that is unsupported (without tags){n}"
-- "{n}"
-- "Test 1 failed: {cwl_runner} --quiet return-unsupported.cwl {q}v1.0{p}cat-job.json{q}{n}"
-- "Required test that is unsupported (without tags){n}"
-- "Does not support required feature{n}"
-- "Test [2/2] Required test that is unsupported (with tags){n}"
-- "{n}"
-- "Test 2 failed: {cwl_runner} --quiet return-unsupported.cwl {q}v1.0{p}cat-job.json{q}{n}"
-- "Required test that is unsupported (with tags){n}"
-- "Does not support required feature{n}"
-- "0 tests passed, 2 failures, 0 unsupported features{n}".format(
-- cwl_runner=cwl_runner, n=n, p=p, q=q
-- )
-+ f"The `id` field is missing.{n}"
-+ f"The `id` field is missing.{n}"
-+ f"Test [1/2] Required test that is unsupported (without tags){n}"
-+ f"{n}"
-+ f"Test 1 failed: {cwl_runner} --quiet return-unsupported.cwl {q}v1.0{p}cat-job.json{q}{n}"
-+ f"Required test that is unsupported (without tags){n}"
-+ f"Does not support required feature{n}"
-+ f"Test [2/2] Required test that is unsupported (with tags){n}"
-+ f"{n}"
-+ f"Test 2 failed: {cwl_runner} --quiet return-unsupported.cwl {q}v1.0{p}cat-job.json{q}{n}"
-+ f"Required test that is unsupported (with tags){n}"
-+ f"Does not support required feature{n}"
-+ f"0 tests passed, 2 failures, 0 unsupported features{n}"
- ) == stderr
-
-
=====================================
debian/rules
=====================================
@@ -8,7 +8,7 @@ export CWLTOOL_OPTIONS=--no-container
#export HOME=$(shell echo $$PWD"/fakehome")
%:
- dh $@ --with python3 --buildsystem=pybuild
+ dh $@ --buildsystem=pybuild
execute_after_dh_auto_install:
find debian -name 'cat1-testcli.cwl' -exec chmod a+x {} \;
=====================================
dev-requirements.txt
=====================================
@@ -1,5 +1,5 @@
diff_cover
-black ~= 23.3
+black ~= 23.7
pylint
pep257
pydocstyle
=====================================
docs/requirements.txt
=====================================
@@ -1,5 +1,5 @@
sphinx >= 2.2
-sphinx-rtd-theme==1.2.1
+sphinx-rtd-theme==1.3.0
sphinx-autoapi
sphinx-autodoc-typehints
typed_ast;python_version<'3.8'
=====================================
mypy-requirements.txt
=====================================
@@ -1,4 +1,4 @@
-mypy==1.3.0
+mypy==1.5.1
types-setuptools
types-requests
types-PyYAML
=====================================
setup.cfg
=====================================
@@ -9,6 +9,6 @@ use_parentheses = True
line_length = 88
[egg_info]
-tag_build = .20230607140609
+tag_build = .20230825125225
tag_date = 0
=====================================
setup.py
=====================================
@@ -65,11 +65,11 @@ setup(
"Operating System :: MacOS :: MacOS X",
"Development Status :: 5 - Production/Stable",
"Programming Language :: Python :: 3.6",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
+ "Programming Language :: Python :: 3.12",
"Typing :: Typed",
],
)
=====================================
tests/test_categories.py
=====================================
@@ -14,15 +14,10 @@ from .util import get_data, run_with_mock_cwl_runner
def test_unsupported_with_required_tests() -> None:
cwl_runner = get_data("tests/test-data/mock_cwl_runner.py")
- args = [
- "--test",
- schema_salad.ref_resolver.file_uri(
- get_data("tests/test-data/required-unsupported.yml")
- ),
- ]
cwd = os.getcwd()
+ os.chdir(get_data("tests/test-data/"))
+ args = ["--test", "required-unsupported.yml"]
try:
- os.chdir(get_data("tests/test-data/"))
error_code, stdout, stderr = run_with_mock_cwl_runner(args)
finally:
os.chdir(cwd)
@@ -35,21 +30,19 @@ def test_unsupported_with_required_tests() -> None:
else:
q = ""
assert (
- "The `id` field is missing.{n}"
- "The `id` field is missing.{n}"
- "Test [1/2] Required test that is unsupported (without tags){n}"
- "{n}"
- "Test 1 failed: {cwl_runner} --quiet return-unsupported.cwl {q}v1.0{p}cat-job.json{q}{n}"
- "Required test that is unsupported (without tags){n}"
- "Does not support required feature{n}"
- "Test [2/2] Required test that is unsupported (with tags){n}"
- "{n}"
- "Test 2 failed: {cwl_runner} --quiet return-unsupported.cwl {q}v1.0{p}cat-job.json{q}{n}"
- "Required test that is unsupported (with tags){n}"
- "Does not support required feature{n}"
- "0 tests passed, 2 failures, 0 unsupported features{n}".format(
- cwl_runner=cwl_runner, n=n, p=p, q=q
- )
+ f"The `id` field is missing.{n}"
+ f"The `id` field is missing.{n}"
+ f"Test [1/2] Required test that is unsupported (without tags){n}"
+ f"{n}"
+ f"Test 1 failed: {cwl_runner} --quiet return-unsupported.cwl {q}v1.0{p}cat-job.json{q}{n}"
+ f"Required test that is unsupported (without tags){n}"
+ f"Does not support required feature{n}"
+ f"Test [2/2] Required test that is unsupported (with tags){n}"
+ f"{n}"
+ f"Test 2 failed: {cwl_runner} --quiet return-unsupported.cwl {q}v1.0{p}cat-job.json{q}{n}"
+ f"Required test that is unsupported (with tags){n}"
+ f"Does not support required feature{n}"
+ f"0 tests passed, 2 failures, 0 unsupported features{n}"
) == stderr
=====================================
tox.ini
=====================================
@@ -1,11 +1,11 @@
[tox]
envlist =
- py{37,38,39,310,311}-lint,
- py{36,37,38,39,310,311}-unit,
- py{36,37,38,39,310,311}-bandit,
- py{37,38,39,310,311}-mypy,
- py310-lintreadme,
- py310-pydocstyle
+ py3{8,9,10,11,12}-lint,
+ py3{6,8,9,10,11,12}-unit,
+ py3{6,8,9,10,11,12}-bandit,
+ py3{8,9,10,11,12}-mypy,
+ py311-lintreadme,
+ py311-pydocstyle
skip_missing_interpreters = True
@@ -17,64 +17,64 @@ testpaths = tests
[gh-actions]
python =
3.6: py36
- 3.7: py37
3.8: py38
3.9: py39
3.10: py310
3.11: py311
+ 3.12: py312
[testenv]
skipsdist =
py3{6,7,8,9,10,11}-!{unit,mypy,lintreadme} = True
description =
- py{36,37,38,39,310,311}-unit: Run the unit tests
- py{36,37,38,39,310,311}-lint: Lint the Python code
- py{36,37,38,39,310,311}-bandit: Search for common security issues
- py{37,38,39,310,311}-mypy: Check for type safety
- py310-pydocstyle: docstring style checker
- py310-lintreadme: Lint the README.rst->.md conversion
+ py3{6,8,9,10,11,12}-unit: Run the unit tests
+ py3{6,8,9,10,11,12}-lint: Lint the Python code
+ py3{6,8,9,10,11,12}-bandit: Search for common security issues
+ py3{8,9,10,11,12}-mypy: Check for type safety
+ py311-pydocstyle: docstring style checker
+ py311-lintreadme: Lint the README.rst->.md conversion
passenv =
CI
GITHUB_*
deps =
- py{36,37,38,39,310,311}-{unit,mypy}: -rrequirements.txt
- py{36,37,38,39,310,311}-{unit,mypy}: -rtest-requirements.txt
- py{36,37,38,39,310,311}-lint: flake8-bugbear
- py{36,37,38,39,310,311}-lint: black~=23.1
- py{36,37,38,39,310,311}-bandit: bandit
- py{37,38,39,310,311}-mypy: -rmypy-requirements.txt
+ py3{6,8,9,10,11,12}-{unit,mypy}: -rrequirements.txt
+ py3{6,8,9,10,11,12}-{unit,mypy}: -rtest-requirements.txt
+ py3{6,8,9,10,11,12}-lint: flake8-bugbear
+ py3{6,8,9,10,11,12}-lint: black~=23.1
+ py3{6,8,9,10,11,12}-bandit: bandit
+ py3{8,9,10,11,12}-mypy: -rmypy-requirements.txt
setenv =
- py{36,37,38,39,310,311}-unit: LC_ALL = C.UTF-8
+ py3{6,8,3,10,11,12}-unit: LC_ALL = C.UTF-8
COV_CORE_SOURCE=cwltest
COV_CORE_CONFIG={toxinidir}/.coveragerc
COV_CORE_DATAFILE={toxinidir}/.coverage.eager
commands =
- py{36,37,38,39,310,311}-unit: python -m pip install -U pip setuptools wheel
- py{36,37,38,39,310,311}-unit: python -m pytest --cov --cov-config={toxinidir}/.coveragerc --cov-append {posargs}
- py{36,37,38,39,310,311}-unit: coverage xml
- py{36,37,38,39,310,311}-bandit: bandit --recursive cwltest
- py{36,37,38,39,310,311}-lint: make flake8
- py{36,37,38,39,310,311}-lint: make format-check
- py{37,38,39,310,311}-mypy: make mypy
- py37-mypy: make mypy_3.6
+ py3{6,8,9,10,11,12}-unit: python -m pip install -U pip setuptools wheel
+ py3{6,8,9,10,11,12}-unit: python -m pytest --cov --cov-config={toxinidir}/.coveragerc --cov-append {posargs}
+ py3{6,8,9,10,11,12}-unit: coverage xml
+ py3{6,8,9,10,11,12}-bandit: bandit --recursive cwltest
+ py3{6,8,9,10,11,12}-lint: make flake8
+ py3{6,8,9,10,11,12}-lint: make format-check
+ py3{8,9,10,11,12}-mypy: make mypy
+ py38-mypy: make mypy_3.6
allowlist_externals =
- py{36,37,38,39,310,311}-lint: flake8
- py{36,37,38,39,310,311}-lint: black
- py{36,37,38,39,310,311}-{mypy,shellcheck,lint,unit}: make
+ py3{6,8,9,10,11,12}-lint: flake8
+ py3{6,8,9,10,11,12}-lint: black
+ py3{6,8,9,10,11,12}-{mypy,shellcheck,lint,unit}: make
skip_install =
- py{36,37,38,39,310,311}-lint: true
- py{36,37,38,39,310,311}-bandit: true
+ py3{6,8,9,10,11,12}-lint: true
+ py3{6,8,9,10,11,12}-bandit: true
-[testenv:py310-pydocstyle]
+[testenv:py311-pydocstyle]
allowlist_externals = make
commands = make diff_pydocstyle_report
deps =
@@ -82,7 +82,7 @@ deps =
diff-cover
skip_install = true
-[testenv:py310-lintreadme]
+[testenv:py311-lintreadme]
description = Lint the README.rst->.md conversion
commands =
python -m build --outdir {distdir}
View it on GitLab: https://salsa.debian.org/med-team/cwltest/-/compare/9edaa3ff16af3facde500d02f8ce7f0381396a2d...ddfaf5a6babe26301ae642465439fce6c0ac8d90
--
View it on GitLab: https://salsa.debian.org/med-team/cwltest/-/compare/9edaa3ff16af3facde500d02f8ce7f0381396a2d...ddfaf5a6babe26301ae642465439fce6c0ac8d90
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/20230825/4d289d65/attachment-0001.htm>
More information about the debian-med-commit
mailing list