Skip to content
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.

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

Regenerate requirements.txt file. #431

Merged
merged 7 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
84 changes: 40 additions & 44 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ anytree==2.12.1
# via pynxtools (pyproject.toml)
ase==3.23.0
# via pynxtools (pyproject.toml)
babel==2.15.0
babel==2.16.0
# via mkdocs-material
certifi==2024.7.4
certifi==2024.8.30
# via requests
cfgv==3.4.0
# via pre-commit
Expand All @@ -22,29 +22,27 @@ click-default-group==1.2.4
# via pynxtools (pyproject.toml)
colorama==0.4.6
# via mkdocs-material
contourpy==1.2.1
contourpy==1.3.0
# via matplotlib
coverage==7.5.4
coverage==7.6.1
# via pytest-cov
cycler==0.12.1
# via matplotlib
distlib==0.3.8
# via virtualenv
exceptiongroup==1.2.1
# via pytest
filelock==3.15.4
filelock==3.16.0
# via virtualenv
fonttools==4.53.1
# via matplotlib
ghp-import==2.1.0
# via mkdocs
h5py==3.11.0
# via pynxtools (pyproject.toml)
identify==2.5.36
identify==2.6.0
# via pre-commit
idna==3.7
idna==3.8
# via requests
importlib-metadata==8.0.0
importlib-metadata==8.5.0
# via pynxtools (pyproject.toml)
iniconfig==2.0.0
# via pytest
Expand All @@ -53,28 +51,31 @@ jinja2==3.1.4
# mkdocs
# mkdocs-macros-plugin
# mkdocs-material
kiwisolver==1.4.5
kiwisolver==1.4.7
# via matplotlib
lxml==5.2.2
lxml==5.3.0
# via pynxtools (pyproject.toml)
markdown==3.6
markdown==3.7
# via
# markdown-include
# mkdocs
# mkdocs-click
# mkdocs-material
# pymdown-extensions
markdown-include==0.8.1
# via pynxtools (pyproject.toml)
markupsafe==2.1.5
# via
# jinja2
# mkdocs
matplotlib==3.9.1
matplotlib==3.9.2
# via ase
mergedeep==1.3.4
# via
# pynxtools (pyproject.toml)
# mkdocs
# mkdocs-get-deps
mkdocs==1.6.0
mkdocs==1.6.1
# via
# pynxtools (pyproject.toml)
# mkdocs-macros-plugin
Expand All @@ -85,19 +86,19 @@ mkdocs-get-deps==0.2.0
# via mkdocs
mkdocs-macros-plugin==1.0.5
# via pynxtools (pyproject.toml)
mkdocs-material==9.5.28
mkdocs-material==9.5.34
# via pynxtools (pyproject.toml)
mkdocs-material-extensions==1.3.1
# via
# pynxtools (pyproject.toml)
# mkdocs-material
mypy==1.10.1
mypy==1.11.2
# via pynxtools (pyproject.toml)
mypy-extensions==1.0.0
# via mypy
nodeenv==1.9.1
# via pre-commit
numpy==2.0.0
numpy==1.26.4
# via
# pynxtools (pyproject.toml)
# ase
Expand All @@ -113,7 +114,7 @@ packaging==24.1
# mkdocs
# pytest
# xarray
paginate==0.5.6
paginate==0.5.7
# via mkdocs-material
pandas==2.2.2
# via
Expand All @@ -123,21 +124,21 @@ pathspec==0.12.1
# via mkdocs
pillow==10.4.0
# via matplotlib
platformdirs==4.2.2
platformdirs==4.3.2
# via
# mkdocs-get-deps
# virtualenv
pluggy==1.5.0
# via pytest
pre-commit==3.7.1
pre-commit==3.8.0
# via pynxtools (pyproject.toml)
pygments==2.18.0
# via mkdocs-material
pymdown-extensions==10.8.1
pymdown-extensions==10.9
# via mkdocs-material
pyparsing==3.1.2
pyparsing==3.1.4
# via matplotlib
pytest==8.2.2
pytest==8.3.3
# via
# pynxtools (pyproject.toml)
# pytest-cov
Expand All @@ -152,9 +153,9 @@ python-dateutil==2.9.0.post0
# matplotlib
# mkdocs-macros-plugin
# pandas
pytz==2024.1
pytz==2024.2
# via pandas
pyyaml==6.0.1
pyyaml==6.0.2
# via
# pynxtools (pyproject.toml)
# mkdocs
Expand All @@ -165,48 +166,43 @@ pyyaml==6.0.1
# pyyaml-env-tag
pyyaml-env-tag==0.1
# via mkdocs
regex==2024.5.15
regex==2024.9.11
# via mkdocs-material
requests==2.32.3
# via mkdocs-material
ruff==0.4.8
ruff==0.5.5
# via pynxtools (pyproject.toml)
scipy==1.14.0
scipy==1.14.1
# via ase
six==1.16.0
# via
# anytree
# python-dateutil
structlog==24.2.0
structlog==24.4.0
# via pynxtools (pyproject.toml)
termcolor==2.4.0
# via mkdocs-macros-plugin
tomli==2.0.1
# via
# coverage
# mypy
# pytest
types-pytz==2024.1.0.20240417
types-pytz==2024.2.0.20240913
# via pynxtools (pyproject.toml)
types-pyyaml==6.0.12.20240311
types-pyyaml==6.0.12.20240808
# via pynxtools (pyproject.toml)
types-requests==2.32.0.20240622
types-requests==2.32.0.20240907
# via pynxtools (pyproject.toml)
typing-extensions==4.12.2
# via mypy
tzdata==2024.1
# via pandas
urllib3==2.2.2
urllib3==2.2.3
# via
# requests
# types-requests
uv==0.2.21
uv==0.4.9
# via pynxtools (pyproject.toml)
virtualenv==20.26.3
virtualenv==20.26.4
# via pre-commit
watchdog==4.0.1
watchdog==5.0.2
# via mkdocs
xarray==2024.6.0
xarray==2024.9.0
# via pynxtools (pyproject.toml)
zipp==3.19.2
zipp==3.20.1
# via importlib-metadata
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies = [
"h5py>=3.6.0",
"xarray>=0.20.2",
"PyYAML>=6.0",
"numpy>=1.21.2",
'numpy>=1.22.4,<2.0.0',
"pandas>=1.3.2",
"ase>=3.19.0",
"mergedeep",
Expand Down
6 changes: 4 additions & 2 deletions src/pynxtools/dataconverter/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ def is_value_valid_element_of_enum(value, elist) -> Tuple[bool, list]:
"ISO8601": (str,),
"NX_BINARY": (bytes, bytearray, np.byte, np.ubyte, np.ndarray),
"NX_BOOLEAN": (bool, np.ndarray, np.bool_),
"NX_CHAR": (str, np.ndarray, np.chararray),
"NX_CHAR": (str, np.ndarray, np.char.chararray),
"NX_DATE_TIME": (str,),
"NX_FLOAT": (float, np.ndarray, np.floating),
"NX_INT": (int, np.ndarray, np.signedinteger),
Expand Down Expand Up @@ -647,7 +647,9 @@ def convert_str_to_bool_safe(value):
return None


def is_valid_data_field(value, nxdl_type, path) -> bool:
def is_valid_data_field(value, nxdl_type, path):
# todo: Check this funciton and wtire test for it. It seems the funciton is not
# working as expected.
"""Checks whether a given value is valid according to what is defined in the NXDL.

This function will also try to convert typical types, for example int to float,
Expand Down
1 change: 0 additions & 1 deletion src/pynxtools/dataconverter/readers/example/reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

#
"""An example reader implementation for the DataConverter."""

import json
Expand Down
Loading