Removed pyaml as a requirement and added PyYAML (#20)

FAIRmat-NFDI · Jun 24, 2022 · c91c1f8 · c91c1f8
1 parent 37b4c89
commit c91c1f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/nexusparser/tools/dataconverter/readers/ellips/reader.py b/nexusparser/tools/dataconverter/readers/ellips/reader.py
@@ -18,10 +18,9 @@
 """An example reader implementation for the DataConverter."""
 import os
 from typing import Tuple
-import pyaml as yaml
+import yaml
 import pandas as pd
 import numpy as np
-import h5py
 from nexusparser.tools.dataconverter.readers.base.reader import BaseReader
 
 DEFAULT_HEADER = {'sep': '\t', 'skip': 0}
@@ -39,7 +38,7 @@ def load_header(filename, default):
             a dict containing the loaded information
     """
     with open(filename, 'rt', encoding='utf8') as file:
-        header = yaml.yaml.safe_load(file)
+        header = yaml.safe_load(file)
 
     for attr in header:
         if "@" in attr:

diff --git a/nexusparser/tools/yaml2nxdl/yaml2nxdl_forward_tools.py b/nexusparser/tools/yaml2nxdl/yaml2nxdl_forward_tools.py
@@ -25,7 +25,7 @@
 import xml.etree.ElementTree as ET
 import textwrap
 
-from pyaml import yaml
+import yaml
 
 from nexusparser.tools import nexus
 

diff --git a/requirements.txt b/requirements.txt
@@ -10,7 +10,7 @@ pytest-cov==2.7.1
 h5py==3.6.0
 python-json-logger==2.0.2
 xarray==0.20.2
-pyaml==21.10.1
+PyYAML==6.0
 numpy==1.21.2
 pandas==1.3.5
 odfpy==1.4.1