[med-svn] [Git][python-team/packages/python-schema-salad][upstream] New upstream version 8.5.20240102191335
Andreas Tille (@tille)
gitlab at salsa.debian.org
Wed Jan 10 07:18:49 GMT 2024
Andreas Tille pushed to branch upstream at Debian Python Team / packages / python-schema-salad
Commits:
c5d0c853 by Andreas Tille at 2024-01-10T08:10:44+01:00
New upstream version 8.5.20240102191335
- - - - -
17 changed files:
- .github/workflows/ci-tests.yml
- .github/workflows/codeql-analysis.yml
- .github/workflows/wheels.yml
- PKG-INFO
- build-schema_salad-docker.sh
- dev-requirements.txt
- mypy-requirements.txt
- pyproject.toml
- requirements.txt
- schema_salad.egg-info/PKG-INFO
- schema_salad/_version.py
- schema_salad/dotnet_codegen.py
- schema_salad/java_codegen.py
- schema_salad/main.py
- schema_salad/metaschema.py
- schema_salad/python_codegen.py
- schema_salad/typescript_codegen.py
Changes:
=====================================
.github/workflows/ci-tests.yml
=====================================
@@ -31,7 +31,7 @@ jobs:
- uses: actions/checkout at v4
- name: Set up Python
- uses: actions/setup-python at v4
+ uses: actions/setup-python at v5
with:
python-version: ${{ env.py-semver }}
cache: pip
@@ -80,7 +80,7 @@ jobs:
fetch-depth: 0
- name: Set up Python
- uses: actions/setup-python at v4
+ uses: actions/setup-python at v5
with:
python-version: ${{ env.py-semver }}
@@ -111,7 +111,7 @@ jobs:
- uses: actions/checkout at v4
- name: Set up Python
- uses: actions/setup-python at v4
+ uses: actions/setup-python at v5
with:
python-version: "3.12"
=====================================
.github/workflows/codeql-analysis.yml
=====================================
@@ -30,9 +30,9 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init at v2
+ uses: github/codeql-action/init at v3
with:
languages: python
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze at v2
+ uses: github/codeql-action/analyze at v3
=====================================
.github/workflows/wheels.yml
=====================================
@@ -36,7 +36,7 @@ jobs:
ref: ${{ github.event.client_payload.ref }}
# Used to host cibuildwheel
- - uses: actions/setup-python at v4
+ - uses: actions/setup-python at v5
# - name: Set up QEMU
# if: runner.os == 'Linux'
@@ -101,7 +101,7 @@ jobs:
id-token: write
if: github.event_name == 'release' && github.event.action == 'published'
steps:
- - uses: actions/download-artifact at v3
+ - uses: actions/download-artifact at v4
with:
# unpacks default artifact into dist/
# if `name: artifact` is omitted, the action will create extra parent dir
=====================================
PKG-INFO
=====================================
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: schema-salad
-Version: 8.5.20231201181309
+Version: 8.5.20240102191335
Summary: Schema Annotations for Linked Avro Data (SALAD)
Home-page: https://github.com/common-workflow-language/schema_salad
Download-URL: https://github.com/common-workflow-language/schema_salad/releases
=====================================
build-schema_salad-docker.sh
=====================================
@@ -3,7 +3,7 @@ set -ex
engine=${ENGINE:-docker} # example: `ENGINE=podman ./build-schema_salad-docker.sh`
${engine} build --file=schema_salad.Dockerfile --tag=quay.io/commonwl/schema_salad .
${engine} run quay.io/commonwl/schema_salad /bin/sh -c \
- 'apk add --no-cache py3-pip && pip install pytest-xdist && cd /tmp && pytest --pyargs schema_salad -n auto'
+ 'apk add --no-cache py3-pip && pip install --break-system-packages pytest-xdist && cd /tmp && pytest --pyargs schema_salad -n auto'
# version=$(git describe --tags)
# if echo "$version" | grep -vq '\-' >& /dev/null ; then
=====================================
dev-requirements.txt
=====================================
@@ -2,11 +2,11 @@ diff_cover < 8.1
pylint < 3.1
pydocstyle < 6.4
flake8 > 4
-flake8-bugbear < 23.12
+flake8-bugbear < 23.13
tox < 3.29 # until tox-pyenv is updated for tox 4.x
tox-pyenv < 1.2
-isort < 5.13
+isort < 5.14
build < 1.0.4
autoflake < 2.3
-bandit < 1.7.6
+bandit < 1.7.7
auto-walrus
=====================================
mypy-requirements.txt
=====================================
@@ -1,4 +1,4 @@
-mypy[mypyc]==1.7.1 # update pyproject.toml as well
+mypy[mypyc]==1.8.0 # update pyproject.toml as well
black>=19.10b0
types-requests
types-dataclasses
=====================================
pyproject.toml
=====================================
@@ -2,7 +2,7 @@
requires = [
"setuptools>=50", # 50 is to match mypyc's minimum
"setuptools_scm[toml]>=8.0.4,<9",
- 'mypy[mypyc]==1.7.0', # update mypy-requirements as well
+ 'mypy[mypyc]==1.8.0', # update mypy-requirements as well
"black>=19.10b0,<23.12",
"types-requests",
"types-dataclasses",
=====================================
requirements.txt
=====================================
@@ -3,6 +3,6 @@ ruamel.yaml >= 0.17.6, < 0.19
rdflib>= 4.2.2, < 8.0.0
mistune>=2.0.3,<2.1
CacheControl[filecache]>= 0.11.7, < 0.14
-black>=19.10b0,<23.12
+black>=19.10b0,<23.13
mypy_extensions
importlib_resources>=1.4;python_version<'3.9'
=====================================
schema_salad.egg-info/PKG-INFO
=====================================
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: schema-salad
-Version: 8.5.20231201181309
+Version: 8.5.20240102191335
Summary: Schema Annotations for Linked Avro Data (SALAD)
Home-page: https://github.com/common-workflow-language/schema_salad
Download-URL: https://github.com/common-workflow-language/schema_salad/releases
=====================================
schema_salad/_version.py
=====================================
@@ -12,5 +12,5 @@ __version__: str
__version_tuple__: VERSION_TUPLE
version_tuple: VERSION_TUPLE
-__version__ = version = '8.5.20231201181309'
-__version_tuple__ = version_tuple = (8, 5, 20231201181309)
+__version__ = version = '8.5.20240102191335'
+__version_tuple__ = version_tuple = (8, 5, 20240102191335)
=====================================
schema_salad/dotnet_codegen.py
=====================================
@@ -441,7 +441,7 @@ public class {cls} : {current_interface}, ISaveable
init="new MapLoader<{}>({}, {}, {})".format(
i.instance_type,
i.name,
- f"'{container}'" if container is not None else None,
+ f"'{container}'" if container is not None else None, # noqa: B907
self.to_dotnet(no_link_check),
),
)
@@ -458,7 +458,7 @@ public class {cls} : {current_interface}, ISaveable
name=self.safe_name(type_declaration["name"]) + "Loader",
init="new RecordLoader<{}>({}, {})".format(
self.safe_name(type_declaration["name"]),
- f"'{container}'" if container is not None else None,
+ f"'{container}'" if container is not None else None, # noqa: B907
self.to_dotnet(no_link_check),
),
loader_type="ILoader<{}>".format(self.safe_name(type_declaration["name"])),
=====================================
schema_salad/java_codegen.py
=====================================
@@ -470,7 +470,7 @@ public class {cls}Impl extends SaveableImpl implements {cls} {{
name=f"map_of_{i.name}",
init="new MapLoader({}, {}, {})".format(
i.name,
- f"'{container}'" if container is not None else None,
+ f"'{container}'" if container is not None else None, # noqa: B907
self.to_java(no_link_check),
),
loader_type=f"Loader<java.util.Map<String, {i.instance_type}>>",
@@ -492,7 +492,9 @@ public class {cls}Impl extends SaveableImpl implements {cls} {{
"{container}, {no_link_check})".format(
clazz=fqclass,
ext="Impl" if not is_abstract else "",
- container=f"'{container}'" if container is not None else None,
+ container=f"'{container}'" # noqa: B907
+ if container is not None
+ else None,
no_link_check=self.to_java(no_link_check),
),
loader_type=f"Loader<{fqclass}>",
=====================================
schema_salad/main.py
=====================================
@@ -120,7 +120,7 @@ def arg_parser() -> argparse.ArgumentParser:
default=None,
help="Optional override of the package name which is other derived "
"from the base URL (Java/TypeScript/.Net/Dlang only).",
- ),
+ )
parser.add_argument(
"--codegen-copyright",
@@ -128,7 +128,7 @@ def arg_parser() -> argparse.ArgumentParser:
metavar="copyright_string",
default=None,
help="Optional copyright of the input schema.",
- ),
+ )
parser.add_argument(
"--codegen-spdx-copyright-text",
@@ -137,7 +137,7 @@ def arg_parser() -> argparse.ArgumentParser:
default=[],
help="List of copyright text. Each entry will show up as "
"'SPDX-FileCopyrightText: ...' (Currently c++ only)",
- ),
+ )
parser.add_argument(
"--codegen-spdx-license-identifier",
@@ -145,7 +145,7 @@ def arg_parser() -> argparse.ArgumentParser:
metavar="spdx_license_identifier",
default=None,
help="Optional spdx license identifier, e.g.: GPL-3.0-only (Currently c++ only)",
- ),
+ )
parser.add_argument(
"--codegen-parser-info",
=====================================
schema_salad/metaschema.py
=====================================
@@ -1220,6 +1220,7 @@ class RecordField(Documented):
_doc.lc.data = doc.lc.data
_doc.lc.filename = doc.lc.filename
_errors__ = []
+ name = None
if "name" in _doc:
try:
name = load_field(
@@ -1260,8 +1261,6 @@ class RecordField(Documented):
[e],
)
)
- else:
- name = None
__original_name_is_none = name is None
if name is None:
@@ -1270,7 +1269,8 @@ class RecordField(Documented):
else:
_errors__.append(ValidationException("missing name"))
if not __original_name_is_none:
- baseuri = name
+ baseuri = cast(str, name)
+ doc = None
if "doc" in _doc:
try:
doc = load_field(
@@ -1311,8 +1311,6 @@ class RecordField(Documented):
[e],
)
)
- else:
- doc = None
try:
if _doc.get("type") is None:
raise ValidationException("missing required field `type`", None, [])
@@ -1386,7 +1384,7 @@ class RecordField(Documented):
extension_fields=extension_fields,
loadingOptions=loadingOptions,
)
- loadingOptions.idx[name] = (_constructed, loadingOptions)
+ loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions)
return _constructed
def save(
@@ -1464,6 +1462,7 @@ class RecordSchema(Saveable):
_doc.lc.data = doc.lc.data
_doc.lc.filename = doc.lc.filename
_errors__ = []
+ fields = None
if "fields" in _doc:
try:
fields = load_field(
@@ -1504,8 +1503,6 @@ class RecordSchema(Saveable):
[e],
)
)
- else:
- fields = None
try:
if _doc.get("type") is None:
raise ValidationException("missing required field `type`", None, [])
@@ -1663,6 +1660,7 @@ class EnumSchema(Saveable):
_doc.lc.data = doc.lc.data
_doc.lc.filename = doc.lc.filename
_errors__ = []
+ name = None
if "name" in _doc:
try:
name = load_field(
@@ -1703,8 +1701,6 @@ class EnumSchema(Saveable):
[e],
)
)
- else:
- name = None
__original_name_is_none = name is None
if name is None:
@@ -1713,7 +1709,7 @@ class EnumSchema(Saveable):
else:
name = "_:" + str(_uuid__.uuid4())
if not __original_name_is_none:
- baseuri = name
+ baseuri = cast(str, name)
try:
if _doc.get("symbols") is None:
raise ValidationException("missing required field `symbols`", None, [])
@@ -1829,7 +1825,7 @@ class EnumSchema(Saveable):
extension_fields=extension_fields,
loadingOptions=loadingOptions,
)
- loadingOptions.idx[name] = (_constructed, loadingOptions)
+ loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions)
return _constructed
def save(
@@ -2517,6 +2513,7 @@ class JsonldPredicate(Saveable):
_doc.lc.data = doc.lc.data
_doc.lc.filename = doc.lc.filename
_errors__ = []
+ _id = None
if "_id" in _doc:
try:
_id = load_field(
@@ -2557,8 +2554,7 @@ class JsonldPredicate(Saveable):
[e],
)
)
- else:
- _id = None
+ _type = None
if "_type" in _doc:
try:
_type = load_field(
@@ -2599,8 +2595,7 @@ class JsonldPredicate(Saveable):
[e],
)
)
- else:
- _type = None
+ _container = None
if "_container" in _doc:
try:
_container = load_field(
@@ -2641,8 +2636,7 @@ class JsonldPredicate(Saveable):
[e],
)
)
- else:
- _container = None
+ identity = None
if "identity" in _doc:
try:
identity = load_field(
@@ -2683,8 +2677,7 @@ class JsonldPredicate(Saveable):
[e],
)
)
- else:
- identity = None
+ noLinkCheck = None
if "noLinkCheck" in _doc:
try:
noLinkCheck = load_field(
@@ -2725,8 +2718,7 @@ class JsonldPredicate(Saveable):
[e],
)
)
- else:
- noLinkCheck = None
+ mapSubject = None
if "mapSubject" in _doc:
try:
mapSubject = load_field(
@@ -2767,8 +2759,7 @@ class JsonldPredicate(Saveable):
[e],
)
)
- else:
- mapSubject = None
+ mapPredicate = None
if "mapPredicate" in _doc:
try:
mapPredicate = load_field(
@@ -2809,8 +2800,7 @@ class JsonldPredicate(Saveable):
[e],
)
)
- else:
- mapPredicate = None
+ refScope = None
if "refScope" in _doc:
try:
refScope = load_field(
@@ -2851,8 +2841,7 @@ class JsonldPredicate(Saveable):
[e],
)
)
- else:
- refScope = None
+ typeDSL = None
if "typeDSL" in _doc:
try:
typeDSL = load_field(
@@ -2893,8 +2882,7 @@ class JsonldPredicate(Saveable):
[e],
)
)
- else:
- typeDSL = None
+ secondaryFilesDSL = None
if "secondaryFilesDSL" in _doc:
try:
secondaryFilesDSL = load_field(
@@ -2935,8 +2923,7 @@ class JsonldPredicate(Saveable):
[e],
)
)
- else:
- secondaryFilesDSL = None
+ subscope = None
if "subscope" in _doc:
try:
subscope = load_field(
@@ -2977,8 +2964,6 @@ class JsonldPredicate(Saveable):
[e],
)
)
- else:
- subscope = None
extension_fields: Dict[str, Any] = {}
for k in _doc.keys():
if k not in cls.attrs:
@@ -3382,6 +3367,7 @@ class SaladRecordField(RecordField):
_doc.lc.data = doc.lc.data
_doc.lc.filename = doc.lc.filename
_errors__ = []
+ name = None
if "name" in _doc:
try:
name = load_field(
@@ -3422,8 +3408,6 @@ class SaladRecordField(RecordField):
[e],
)
)
- else:
- name = None
__original_name_is_none = name is None
if name is None:
@@ -3432,7 +3416,8 @@ class SaladRecordField(RecordField):
else:
_errors__.append(ValidationException("missing name"))
if not __original_name_is_none:
- baseuri = name
+ baseuri = cast(str, name)
+ doc = None
if "doc" in _doc:
try:
doc = load_field(
@@ -3473,8 +3458,6 @@ class SaladRecordField(RecordField):
[e],
)
)
- else:
- doc = None
try:
if _doc.get("type") is None:
raise ValidationException("missing required field `type`", None, [])
@@ -3517,6 +3500,7 @@ class SaladRecordField(RecordField):
[e],
)
)
+ jsonldPredicate = None
if "jsonldPredicate" in _doc:
try:
jsonldPredicate = load_field(
@@ -3557,8 +3541,7 @@ class SaladRecordField(RecordField):
[e],
)
)
- else:
- jsonldPredicate = None
+ default = None
if "default" in _doc:
try:
default = load_field(
@@ -3599,8 +3582,6 @@ class SaladRecordField(RecordField):
[e],
)
)
- else:
- default = None
extension_fields: Dict[str, Any] = {}
for k in _doc.keys():
if k not in cls.attrs:
@@ -3634,7 +3615,7 @@ class SaladRecordField(RecordField):
extension_fields=extension_fields,
loadingOptions=loadingOptions,
)
- loadingOptions.idx[name] = (_constructed, loadingOptions)
+ loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions)
return _constructed
def save(
@@ -3775,6 +3756,7 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
_doc.lc.data = doc.lc.data
_doc.lc.filename = doc.lc.filename
_errors__ = []
+ name = None
if "name" in _doc:
try:
name = load_field(
@@ -3815,8 +3797,6 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
[e],
)
)
- else:
- name = None
__original_name_is_none = name is None
if name is None:
@@ -3825,7 +3805,8 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
else:
_errors__.append(ValidationException("missing name"))
if not __original_name_is_none:
- baseuri = name
+ baseuri = cast(str, name)
+ inVocab = None
if "inVocab" in _doc:
try:
inVocab = load_field(
@@ -3866,8 +3847,7 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
[e],
)
)
- else:
- inVocab = None
+ fields = None
if "fields" in _doc:
try:
fields = load_field(
@@ -3908,8 +3888,6 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
[e],
)
)
- else:
- fields = None
try:
if _doc.get("type") is None:
raise ValidationException("missing required field `type`", None, [])
@@ -3952,6 +3930,7 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
[e],
)
)
+ doc = None
if "doc" in _doc:
try:
doc = load_field(
@@ -3992,8 +3971,7 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
[e],
)
)
- else:
- doc = None
+ docParent = None
if "docParent" in _doc:
try:
docParent = load_field(
@@ -4034,8 +4012,7 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
[e],
)
)
- else:
- docParent = None
+ docChild = None
if "docChild" in _doc:
try:
docChild = load_field(
@@ -4076,8 +4053,7 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
[e],
)
)
- else:
- docChild = None
+ docAfter = None
if "docAfter" in _doc:
try:
docAfter = load_field(
@@ -4118,8 +4094,7 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
[e],
)
)
- else:
- docAfter = None
+ jsonldPredicate = None
if "jsonldPredicate" in _doc:
try:
jsonldPredicate = load_field(
@@ -4160,8 +4135,7 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
[e],
)
)
- else:
- jsonldPredicate = None
+ documentRoot = None
if "documentRoot" in _doc:
try:
documentRoot = load_field(
@@ -4202,8 +4176,7 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
[e],
)
)
- else:
- documentRoot = None
+ abstract = None
if "abstract" in _doc:
try:
abstract = load_field(
@@ -4244,8 +4217,7 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
[e],
)
)
- else:
- abstract = None
+ extends = None
if "extends" in _doc:
try:
extends = load_field(
@@ -4286,8 +4258,7 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
[e],
)
)
- else:
- extends = None
+ specialize = None
if "specialize" in _doc:
try:
specialize = load_field(
@@ -4328,8 +4299,6 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
[e],
)
)
- else:
- specialize = None
extension_fields: Dict[str, Any] = {}
for k in _doc.keys():
if k not in cls.attrs:
@@ -4371,7 +4340,7 @@ class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
extension_fields=extension_fields,
loadingOptions=loadingOptions,
)
- loadingOptions.idx[name] = (_constructed, loadingOptions)
+ loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions)
return _constructed
def save(
@@ -4562,6 +4531,7 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
_doc.lc.data = doc.lc.data
_doc.lc.filename = doc.lc.filename
_errors__ = []
+ name = None
if "name" in _doc:
try:
name = load_field(
@@ -4602,8 +4572,6 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
[e],
)
)
- else:
- name = None
__original_name_is_none = name is None
if name is None:
@@ -4612,7 +4580,8 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
else:
name = "_:" + str(_uuid__.uuid4())
if not __original_name_is_none:
- baseuri = name
+ baseuri = cast(str, name)
+ inVocab = None
if "inVocab" in _doc:
try:
inVocab = load_field(
@@ -4653,8 +4622,6 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
[e],
)
)
- else:
- inVocab = None
try:
if _doc.get("symbols") is None:
raise ValidationException("missing required field `symbols`", None, [])
@@ -4739,6 +4706,7 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
[e],
)
)
+ doc = None
if "doc" in _doc:
try:
doc = load_field(
@@ -4779,8 +4747,7 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
[e],
)
)
- else:
- doc = None
+ docParent = None
if "docParent" in _doc:
try:
docParent = load_field(
@@ -4821,8 +4788,7 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
[e],
)
)
- else:
- docParent = None
+ docChild = None
if "docChild" in _doc:
try:
docChild = load_field(
@@ -4863,8 +4829,7 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
[e],
)
)
- else:
- docChild = None
+ docAfter = None
if "docAfter" in _doc:
try:
docAfter = load_field(
@@ -4905,8 +4870,7 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
[e],
)
)
- else:
- docAfter = None
+ jsonldPredicate = None
if "jsonldPredicate" in _doc:
try:
jsonldPredicate = load_field(
@@ -4947,8 +4911,7 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
[e],
)
)
- else:
- jsonldPredicate = None
+ documentRoot = None
if "documentRoot" in _doc:
try:
documentRoot = load_field(
@@ -4989,8 +4952,7 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
[e],
)
)
- else:
- documentRoot = None
+ extends = None
if "extends" in _doc:
try:
extends = load_field(
@@ -5031,8 +4993,6 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
[e],
)
)
- else:
- extends = None
extension_fields: Dict[str, Any] = {}
for k in _doc.keys():
if k not in cls.attrs:
@@ -5072,7 +5032,7 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
extension_fields=extension_fields,
loadingOptions=loadingOptions,
)
- loadingOptions.idx[name] = (_constructed, loadingOptions)
+ loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions)
return _constructed
def save(
@@ -5242,6 +5202,7 @@ class SaladMapSchema(NamedType, MapSchema, SchemaDefinedType):
_doc.lc.data = doc.lc.data
_doc.lc.filename = doc.lc.filename
_errors__ = []
+ name = None
if "name" in _doc:
try:
name = load_field(
@@ -5282,8 +5243,6 @@ class SaladMapSchema(NamedType, MapSchema, SchemaDefinedType):
[e],
)
)
- else:
- name = None
__original_name_is_none = name is None
if name is None:
@@ -5292,7 +5251,8 @@ class SaladMapSchema(NamedType, MapSchema, SchemaDefinedType):
else:
_errors__.append(ValidationException("missing name"))
if not __original_name_is_none:
- baseuri = name
+ baseuri = cast(str, name)
+ inVocab = None
if "inVocab" in _doc:
try:
inVocab = load_field(
@@ -5333,8 +5293,6 @@ class SaladMapSchema(NamedType, MapSchema, SchemaDefinedType):
[e],
)
)
- else:
- inVocab = None
try:
if _doc.get("type") is None:
raise ValidationException("missing required field `type`", None, [])
@@ -5419,6 +5377,7 @@ class SaladMapSchema(NamedType, MapSchema, SchemaDefinedType):
[e],
)
)
+ doc = None
if "doc" in _doc:
try:
doc = load_field(
@@ -5459,8 +5418,7 @@ class SaladMapSchema(NamedType, MapSchema, SchemaDefinedType):
[e],
)
)
- else:
- doc = None
+ docParent = None
if "docParent" in _doc:
try:
docParent = load_field(
@@ -5501,8 +5459,7 @@ class SaladMapSchema(NamedType, MapSchema, SchemaDefinedType):
[e],
)
)
- else:
- docParent = None
+ docChild = None
if "docChild" in _doc:
try:
docChild = load_field(
@@ -5543,8 +5500,7 @@ class SaladMapSchema(NamedType, MapSchema, SchemaDefinedType):
[e],
)
)
- else:
- docChild = None
+ docAfter = None
if "docAfter" in _doc:
try:
docAfter = load_field(
@@ -5585,8 +5541,7 @@ class SaladMapSchema(NamedType, MapSchema, SchemaDefinedType):
[e],
)
)
- else:
- docAfter = None
+ jsonldPredicate = None
if "jsonldPredicate" in _doc:
try:
jsonldPredicate = load_field(
@@ -5627,8 +5582,7 @@ class SaladMapSchema(NamedType, MapSchema, SchemaDefinedType):
[e],
)
)
- else:
- jsonldPredicate = None
+ documentRoot = None
if "documentRoot" in _doc:
try:
documentRoot = load_field(
@@ -5669,8 +5623,6 @@ class SaladMapSchema(NamedType, MapSchema, SchemaDefinedType):
[e],
)
)
- else:
- documentRoot = None
extension_fields: Dict[str, Any] = {}
for k in _doc.keys():
if k not in cls.attrs:
@@ -5709,7 +5661,7 @@ class SaladMapSchema(NamedType, MapSchema, SchemaDefinedType):
extension_fields=extension_fields,
loadingOptions=loadingOptions,
)
- loadingOptions.idx[name] = (_constructed, loadingOptions)
+ loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions)
return _constructed
def save(
@@ -5871,6 +5823,7 @@ class SaladUnionSchema(NamedType, UnionSchema, DocType):
_doc.lc.data = doc.lc.data
_doc.lc.filename = doc.lc.filename
_errors__ = []
+ name = None
if "name" in _doc:
try:
name = load_field(
@@ -5911,8 +5864,6 @@ class SaladUnionSchema(NamedType, UnionSchema, DocType):
[e],
)
)
- else:
- name = None
__original_name_is_none = name is None
if name is None:
@@ -5921,7 +5872,8 @@ class SaladUnionSchema(NamedType, UnionSchema, DocType):
else:
_errors__.append(ValidationException("missing name"))
if not __original_name_is_none:
- baseuri = name
+ baseuri = cast(str, name)
+ inVocab = None
if "inVocab" in _doc:
try:
inVocab = load_field(
@@ -5962,8 +5914,6 @@ class SaladUnionSchema(NamedType, UnionSchema, DocType):
[e],
)
)
- else:
- inVocab = None
try:
if _doc.get("names") is None:
raise ValidationException("missing required field `names`", None, [])
@@ -6048,6 +5998,7 @@ class SaladUnionSchema(NamedType, UnionSchema, DocType):
[e],
)
)
+ doc = None
if "doc" in _doc:
try:
doc = load_field(
@@ -6088,8 +6039,7 @@ class SaladUnionSchema(NamedType, UnionSchema, DocType):
[e],
)
)
- else:
- doc = None
+ docParent = None
if "docParent" in _doc:
try:
docParent = load_field(
@@ -6130,8 +6080,7 @@ class SaladUnionSchema(NamedType, UnionSchema, DocType):
[e],
)
)
- else:
- docParent = None
+ docChild = None
if "docChild" in _doc:
try:
docChild = load_field(
@@ -6172,8 +6121,7 @@ class SaladUnionSchema(NamedType, UnionSchema, DocType):
[e],
)
)
- else:
- docChild = None
+ docAfter = None
if "docAfter" in _doc:
try:
docAfter = load_field(
@@ -6214,8 +6162,7 @@ class SaladUnionSchema(NamedType, UnionSchema, DocType):
[e],
)
)
- else:
- docAfter = None
+ documentRoot = None
if "documentRoot" in _doc:
try:
documentRoot = load_field(
@@ -6256,8 +6203,6 @@ class SaladUnionSchema(NamedType, UnionSchema, DocType):
[e],
)
)
- else:
- documentRoot = None
extension_fields: Dict[str, Any] = {}
for k in _doc.keys():
if k not in cls.attrs:
@@ -6295,7 +6240,7 @@ class SaladUnionSchema(NamedType, UnionSchema, DocType):
extension_fields=extension_fields,
loadingOptions=loadingOptions,
)
- loadingOptions.idx[name] = (_constructed, loadingOptions)
+ loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions)
return _constructed
def save(
@@ -6442,6 +6387,7 @@ class Documentation(NamedType, DocType):
_doc.lc.data = doc.lc.data
_doc.lc.filename = doc.lc.filename
_errors__ = []
+ name = None
if "name" in _doc:
try:
name = load_field(
@@ -6482,8 +6428,6 @@ class Documentation(NamedType, DocType):
[e],
)
)
- else:
- name = None
__original_name_is_none = name is None
if name is None:
@@ -6492,7 +6436,8 @@ class Documentation(NamedType, DocType):
else:
_errors__.append(ValidationException("missing name"))
if not __original_name_is_none:
- baseuri = name
+ baseuri = cast(str, name)
+ inVocab = None
if "inVocab" in _doc:
try:
inVocab = load_field(
@@ -6533,8 +6478,7 @@ class Documentation(NamedType, DocType):
[e],
)
)
- else:
- inVocab = None
+ doc = None
if "doc" in _doc:
try:
doc = load_field(
@@ -6575,8 +6519,7 @@ class Documentation(NamedType, DocType):
[e],
)
)
- else:
- doc = None
+ docParent = None
if "docParent" in _doc:
try:
docParent = load_field(
@@ -6617,8 +6560,7 @@ class Documentation(NamedType, DocType):
[e],
)
)
- else:
- docParent = None
+ docChild = None
if "docChild" in _doc:
try:
docChild = load_field(
@@ -6659,8 +6601,7 @@ class Documentation(NamedType, DocType):
[e],
)
)
- else:
- docChild = None
+ docAfter = None
if "docAfter" in _doc:
try:
docAfter = load_field(
@@ -6701,8 +6642,6 @@ class Documentation(NamedType, DocType):
[e],
)
)
- else:
- docAfter = None
try:
if _doc.get("type") is None:
raise ValidationException("missing required field `type`", None, [])
@@ -6780,7 +6719,7 @@ class Documentation(NamedType, DocType):
extension_fields=extension_fields,
loadingOptions=loadingOptions,
)
- loadingOptions.idx[name] = (_constructed, loadingOptions)
+ loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions)
return _constructed
def save(
=====================================
schema_salad/python_codegen.py
=====================================
@@ -377,7 +377,7 @@ if _errors__:
)
if self.idfield:
self.out.write(
- f" loadingOptions.idx[{self.safe_name(self.idfield)}] "
+ f" loadingOptions.idx[cast(str, {self.safe_name(self.idfield)})] "
"= (_constructed, loadingOptions)\n"
)
@@ -428,8 +428,8 @@ if _errors__:
f"map_of_{i.name}",
"_MapLoader({}, {}, {}, {})".format(
i.name,
- f"'{name}'",
- f"'{container}'" if container is not None else None,
+ f"'{name}'", # noqa: B907
+ f"'{container}'" if container is not None else None, # noqa: B907
no_link_check,
),
)
@@ -474,7 +474,7 @@ if _errors__:
self.safe_name(type_declaration["name"]) + "Loader",
"_RecordLoader({}, {}, {})".format(
self.safe_name(type_declaration["name"]),
- f"'{container}'" if container is not None else None,
+ f"'{container}'" if container is not None else None, # noqa: B907
no_link_check,
),
abstract=type_declaration.get("abstract", False),
@@ -545,7 +545,7 @@ if _errors__:
else:
{opt}
if not __original_{safename}_is_none:
- baseuri = {safename}
+ baseuri = cast(str, {safename})
""".format(
safename=self.safe_name(name), opt=opt
)
@@ -566,6 +566,7 @@ if _errors__:
return
if optional:
+ self.out.write(f""" {self.safe_name(name)} = None\n""")
self.out.write(f""" if "{shortname(name)}" in _doc:\n""") # noqa: B907
spc = " "
else:
@@ -652,14 +653,6 @@ if _errors__:
spc=spc,
)
)
- if optional:
- self.out.write(
- """ else:
- {safename} = None
-""".format(
- safename=self.safe_name(name)
- )
- )
if name == self.idfield or not self.idfield:
baseurl = "base_url"
@@ -736,7 +729,7 @@ if self.{safename} is not None:
TypeDef(
f"typedsl_{self.safe_name(inner.name)}_{ref_scope}",
f"_TypeDSLLoader({self.safe_name(inner.name)}, {ref_scope}, " # noqa: B907
- f"'{self.salad_version}')",
+ f"'{self.salad_version}')", # noqa: B907
)
)
=====================================
schema_salad/typescript_codegen.py
=====================================
@@ -404,7 +404,7 @@ export class {cls} extends Saveable implements Internal.{current_interface} {{
f"mapOf{i.name}",
"new _MapLoader([{}], {}, {})".format(
i.name,
- f"'{container}'" if container is not None else None,
+ f"'{container}'" if container is not None else None, # noqa: B907
self.to_typescript(no_link_check),
),
instance_type=f"Dictionary<{i.instance_type}>",
@@ -422,7 +422,7 @@ export class {cls} extends Saveable implements Internal.{current_interface} {{
self.safe_name(type_declaration["name"]) + "Loader",
"new _RecordLoader({}.fromDoc, {}, {})".format(
self.safe_name(type_declaration["name"]),
- f"'{container}'" if container is not None else None,
+ f"'{container}'" if container is not None else None, # noqa: B907
self.to_typescript(no_link_check),
),
instance_type="Internal." + self.safe_name(type_declaration["name"]),
View it on GitLab: https://salsa.debian.org/python-team/packages/python-schema-salad/-/commit/c5d0c85339477599b6ceeb841f9d754e4fd821fd
--
View it on GitLab: https://salsa.debian.org/python-team/packages/python-schema-salad/-/commit/c5d0c85339477599b6ceeb841f9d754e4fd821fd
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/20240110/810fd25b/attachment-0001.htm>
More information about the debian-med-commit
mailing list