eido 0.2.3__py3-none-any.whl → 0.2.4__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
eido/_version.py CHANGED
@@ -1 +1 @@
1
- __version__ = "0.2.3"
1
+ __version__ = "0.2.4"
@@ -42,8 +42,7 @@ def yaml_pep_filter(p, **kwargs) -> Dict[str, str]:
42
42
  """
43
43
  from yaml import dump
44
44
 
45
- data = p.config.to_dict()
46
- return {"project": dump(data, default_flow_style=False)}
45
+ return {"project": dump(p.config, default_flow_style=False)}
47
46
 
48
47
 
49
48
  def csv_pep_filter(p, **kwargs) -> Dict[str, str]:
@@ -70,7 +69,7 @@ def processed_pep_filter(p, **kwargs) -> Dict[str, str]:
70
69
  samples_as_objects = kwargs.get("samples_as_objects")
71
70
  subsamples_as_objects = kwargs.get("subsamples_as_objects")
72
71
 
73
- prj_repr = p.config.to_dict()
72
+ prj_repr = p.config
74
73
 
75
74
  return {
76
75
  "project": str(prj_repr),
eido/output_formatters.py CHANGED
@@ -110,7 +110,7 @@ class MultilineOutputFormatter(BaseOutputFormatter):
110
110
  ):
111
111
  value = sample[attribute][sample_index]
112
112
  else:
113
- value = sample[attribute]
113
+ value = sample.get(attribute)
114
114
 
115
115
  sample_row.append(value or "")
116
116
 
eido/validation.py CHANGED
@@ -43,6 +43,10 @@ def _validate_object(obj: Mapping, schema: Union[str, dict], sample_name_colname
43
43
  instance_name = error.instance[sample_name_colname]
44
44
  except KeyError:
45
45
  instance_name = "project"
46
+ except TypeError:
47
+ instance_name = obj["samples"][error.absolute_path[1]][
48
+ sample_name_colname
49
+ ]
46
50
  errors_by_type[error.message].append(
47
51
  {
48
52
  "type": error.message,
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: eido
3
- Version: 0.2.3
3
+ Version: 0.2.4
4
4
  Summary: A project metadata validator
5
5
  Home-page: https://github.com/pepkit/eido/
6
6
  Author: Michal Stolarczyk, Nathan Sheffield
@@ -18,7 +18,7 @@ License-File: LICENSE.txt
18
18
  Requires-Dist: jsonschema>=3.0.1
19
19
  Requires-Dist: logmuse>=0.2.5
20
20
  Requires-Dist: pandas
21
- Requires-Dist: peppy>=0.40.6
21
+ Requires-Dist: peppy>=0.40.7
22
22
  Requires-Dist: ubiquerg>=0.5.2
23
23
  Requires-Dist: importlib-metadata; python_version < "3.10"
24
24
 
@@ -1,19 +1,19 @@
1
1
  eido/__init__.py,sha256=D3CD9BefyY5Yckz-LswPca_VH_RIcZpr53_siXkbi14,612
2
2
  eido/__main__.py,sha256=L1wnnEreqYv27ZaaCwwImCIHZK0Mz5IxS80ZsNcS1zg,189
3
- eido/_version.py,sha256=PNiDER4qM19h9zdsdfgKt2_dT4WgYK7EguJ8RU2qA_g,22
3
+ eido/_version.py,sha256=SBl2EPFW-ltPvQ7vbVWItyAsz3aKYIpjO7vcfr84GkU,22
4
4
  eido/argparser.py,sha256=vx59eO8CClaQpXehcW052y4HW5mttGTqM96PoJJwWkE,4806
5
5
  eido/cli.py,sha256=dXPaqF6uUYnGMlW2H9Mc628CfhCl3pEinxWYnQ94SVc,5814
6
6
  eido/const.py,sha256=Tb-fDKvneyZX3qLgLYVWtGGs4Hw4tRogB3OXIlwtpdY,1109
7
7
  eido/conversion.py,sha256=MKuJWvLB10opq_noTiOSviiiJgMLY7n8B2stfCjEELE,4002
8
- eido/conversion_plugins.py,sha256=zqjJbUo1p3l50NddGcO2KccnK5fXvQPe-GFyABr5Pg4,2529
8
+ eido/conversion_plugins.py,sha256=nZEP16WFSD2UI6PKgA3TNX-tUzrOzXg11QJ4K8PiyDg,2493
9
9
  eido/exceptions.py,sha256=C9gc_XnxYXT8uH7xXoh1NN7KUFXbRvLp4VN7H1DqF9w,1213
10
10
  eido/inspection.py,sha256=rfuXnAawGBWQFz_hbJA2VYP_sFvpYxztxOiXL6t610o,3223
11
- eido/output_formatters.py,sha256=bKqaashXRh-Vp6WbQzq8lQXbNHtvOR9IdXkn31rCmL8,4481
11
+ eido/output_formatters.py,sha256=gmS-UIRjRQ8Eg24UEyp2fmU046SDbIS7jh4zOLFHlcE,4485
12
12
  eido/schema.py,sha256=I75jlUlUdswkne6Xq2XLD8zm-f8p7VITQIj7J_x7aH8,2664
13
- eido/validation.py,sha256=vmujhaDmNp2SFLhjBrh1SVGhM_NDf3ARVt91ZHaqrUA,8527
14
- eido-0.2.3.dist-info/LICENSE.txt,sha256=oB6ZGDa4kcznznJKJsLLFFcOZyi8Y6e2Jv0rJozgp-I,1269
15
- eido-0.2.3.dist-info/METADATA,sha256=kku0Ni4ZW43It53F7_xXQVVyKl7r9HIiBdRecT3USFM,1519
16
- eido-0.2.3.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
17
- eido-0.2.3.dist-info/entry_points.txt,sha256=pu2Iw-IUjVa_bKRgt0xUtPT9iwfR0y2nfRYyaRlkLZU,263
18
- eido-0.2.3.dist-info/top_level.txt,sha256=oltuMelApqcnJZ09Rrg3lF7kmTkmU5bcA6oRvXhNu6A,5
19
- eido-0.2.3.dist-info/RECORD,,
13
+ eido/validation.py,sha256=s1l8rJRJjBcGJBywRDVpy3kPBpPE0EssfAmJw06p0Hc,8687
14
+ eido-0.2.4.dist-info/LICENSE.txt,sha256=oB6ZGDa4kcznznJKJsLLFFcOZyi8Y6e2Jv0rJozgp-I,1269
15
+ eido-0.2.4.dist-info/METADATA,sha256=etOx2Qozm5OQmUD-lFAgpmmTPuGAfVOA7YbuDmsx55w,1519
16
+ eido-0.2.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
17
+ eido-0.2.4.dist-info/entry_points.txt,sha256=pu2Iw-IUjVa_bKRgt0xUtPT9iwfR0y2nfRYyaRlkLZU,263
18
+ eido-0.2.4.dist-info/top_level.txt,sha256=oltuMelApqcnJZ09Rrg3lF7kmTkmU5bcA6oRvXhNu6A,5
19
+ eido-0.2.4.dist-info/RECORD,,
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: setuptools (74.1.2)
2
+ Generator: setuptools (75.1.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5