8000 Removed pyaml as a requirement and added PyYAML by sherjeelshabih · Pull Request #20 · FAIRmat-NFDI/pynxtools · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Removed pyaml as a requirement and added PyYAML #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2022
Merged

Removed pyaml as a requirement and added PyYAML #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions nexusparser/tools/dataconverter/readers/ellips/reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion nexusparser/tools/yaml2nxdl/yaml2nxdl_forward_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import xml.etree.ElementTree as ET
import textwrap

from pyaml import yaml
import yaml

from nexusparser.tools import nexus

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0