8000 Fix version retrieval for Ellipsometry reader by domna · Pull Request #267 · FAIRmat-NFDI/pynxtools · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix version retrieval for Ellipsometry reader #267

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 2 commits into from
Mar 8, 2024
Merged

Fix version retrieval for Ellipsometry reader #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb69df5
Catch PackageNotFoundError
domna Mar 7, 2024
c89366b
Fix ifes versioning
domna Mar 7, 2024
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
23 changes: 14 additions & 9 deletions pynxtools/dataconverter/readers/ellips/reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,20 @@
# limitations under the License.
#
"""An example reader implementation for the DataConverter."""
import os
from typing import Tuple, Any
import math
from importlib.metadata import version
import yaml
import pandas as pd
import os
from importlib.metadata import PackageNotFoundError, version
from typing import Any, Tuple

import numpy as np
import pandas as pd
import yaml

from pynxtools import get_nexus_version, get_nexus_version_hash
from pynxtools.dataconverter.helpers import extract_atom_types
from pynxtools.dataconverter.readers.base.reader import BaseReader
from pynxtools.dataconverter.readers.ellips.mock import MockEllips
from pynxtools.dataconverter.helpers import extract_atom_types
from pynxtools.dataconverter.readers.utils import flatten_and_replace, FlattenSettings
from pynxtools import get_nexus_version, get_nexus_version_hash
from pynxtools.dataconverter.readers.utils import FlattenSettings, flatten_and_replace

DEFAULT_HEADER = {"sep": "\t", "skip": 0}

Expand Down Expand Up @@ -466,7 +468,10 @@ def read(
)
template["/ENTRY[entry]/definition/@version"] = get_nexus_version()
template["/ENTRY[entry]/program_name"] = "pynxtools"
template["/ENTRY[entry]/program_name/@version"] = version("pynxtools")
try:
template["/ENTRY[entry]/program_name/@version"] = version("pynxtools")
except PackageNotFoundError:
pass
template[
"/ENTRY[entry]/program_name/@url"
] = "https://github.com/FAIRmat-NFDI/pynxtools"
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies = [
"ase>=3.19.0",
"flatdict>=4.0.1",
"hyperspy>=1.7.4",
"ifes_apt_tc_data_modeling>=0.0.9",
"ifes_apt_tc_data_modeling<0.2,>=0.0.9",
"gitpython>=3.1.24",
"pytz>=2021.1",
"kikuchipy>=0.8.2",
Expand Down
0