Skip to content

Commit

Permalink
update deps, fix failing tests with new table format
Browse files Browse the repository at this point in the history
  • Loading branch information
@trappitsch
trappitsch committed May 29, 2024
1 parent 36f4142 commit 646a487
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 64 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = [
dependencies = [
"matplotlib>=3.7.4",
"numpy>=1.24.4",
"rttools @ git+https://github.com/trappitsch/rttools@string_formatter",
"rttools @ git+https://github.com/trappitsch/rttools",
]
readme = "README.md"
requires-python = ">= 3.8"
Expand Down
66 changes: 35 additions & 31 deletions requirements-dev.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
-e file:.
attrs==23.2.0
# via hypothesis
babel==2.14.0
babel==2.15.0
# via mkdocs-material
certifi==2024.2.2
# via requests
Expand All @@ -23,32 +23,32 @@ click==8.1.7
colorama==0.4.6
# via griffe
# via mkdocs-material
contourpy==1.2.0
contourpy==1.2.1
# via matplotlib
coverage==7.4.3
coverage==7.5.3
# via pytest-cov
cycler==0.12.1
# via matplotlib
fonttools==4.49.0
fonttools==4.52.4
# via matplotlib
ghp-import==2.1.0
# via mkdocs
griffe==0.41.3
griffe==0.45.2
# via mkdocstrings-python
hypothesis==6.98.13
idna==3.6
hypothesis==6.103.0
idna==3.7
# via requests
iniabu==1.1.2
# via rttools
iniconfig==2.0.0
# via pytest
jinja2==3.1.3
jinja2==3.1.4
# via mkdocs
# via mkdocs-material
# via mkdocstrings
kiwisolver==1.4.5
# via matplotlib
markdown==3.5.2
markdown==3.6
# via mkdocs
# via mkdocs-autorefs
# via mkdocs-material
Expand All @@ -59,26 +59,29 @@ markupsafe==2.1.5
# via mkdocs
# via mkdocs-autorefs
# via mkdocstrings
matplotlib==3.8.3
matplotlib==3.9.0
# via rimsschemedrawer
# via rttools
mergedeep==1.3.4
# via mkdocs
mkdocs==1.5.3
# via mkdocs-get-deps
mkdocs==1.6.0
# via mkdocs-autorefs
# via mkdocs-material
# via mkdocstrings
# via rimsschemedrawer
mkdocs-autorefs==1.0.1
# via mkdocstrings
mkdocs-material==9.5.12
mkdocs-get-deps==0.2.0
# via mkdocs
mkdocs-material==9.5.25
# via rimsschemedrawer
mkdocs-material-extensions==1.3.1
# via mkdocs-material
mkdocstrings==0.24.1
mkdocstrings==0.25.1
# via mkdocstrings-python
# via rimsschemedrawer
mkdocstrings-python==1.8.0
mkdocstrings-python==1.10.3
# via mkdocstrings
numpy==1.26.4
# via contourpy
Expand All @@ -89,7 +92,7 @@ numpy==1.26.4
# via rimsschemedrawer
# via rttools
# via scipy
packaging==23.2
packaging==24.0
# via matplotlib
# via mkdocs
# via pytest
Expand All @@ -100,52 +103,53 @@ pandas==2.2.2
# via rttools
pathspec==0.12.1
# via mkdocs
pillow==10.2.0
pillow==10.3.0
# via matplotlib
pint==0.23
# via rttools
platformdirs==4.2.0
# via mkdocs
platformdirs==4.2.2
# via mkdocs-get-deps
# via mkdocstrings
pluggy==1.4.0
pluggy==1.5.0
# via pytest
pyarrow==16.1.0
# via rttools
pygments==2.17.2
pygments==2.18.0
# via mkdocs-material
pymdown-extensions==10.7.1
pymdown-extensions==10.8.1
# via mkdocs-material
# via mkdocstrings
pyparsing==3.1.1
pyparsing==3.1.2
# via matplotlib
pyqt6==6.6.1
pyqt6==6.7.0
# via rimsschemedrawer
pyqt6-qt6==6.6.2
pyqt6-qt6==6.7.0
# via pyqt6
pyqt6-sip==13.6.0
# via pyqt6
pytest==8.0.2
pytest==8.2.1
# via pytest-cov
pytest-cov==4.1.0
python-dateutil==2.8.2
pytest-cov==5.0.0
python-dateutil==2.9.0.post0
# via ghp-import
# via matplotlib
# via pandas
pytz==2024.1
# via pandas
pyyaml==6.0.1
# via mkdocs
# via mkdocs-get-deps
# via pymdown-extensions
# via pyyaml-env-tag
pyyaml-env-tag==0.1
# via mkdocs
qtpy==2.4.1
# via rimsschemedrawer
regex==2023.12.25
regex==2024.5.15
# via mkdocs-material
requests==2.31.0
requests==2.32.2
# via mkdocs-material
rttools @ git+https://github.com/trappitsch/rttools@1b91e4f1db216c5056473db2de692d7d8dcc30c3
rttools @ git+https://github.com/trappitsch/rttools@b01d4af6f767190a22e22a953e9d4ce18c7b5d9f
# via rimsschemedrawer
scipy==1.13.1
# via rttools
Expand All @@ -159,5 +163,5 @@ tzdata==2024.1
# via pandas
urllib3==2.2.1
# via requests
watchdog==4.0.0
watchdog==4.0.1
# via mkdocs
56 changes: 30 additions & 26 deletions requirements.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# generate-hashes: false

-e file:.
babel==2.14.0
babel==2.15.0
# via mkdocs-material
certifi==2024.2.2
# via requests
Expand All @@ -21,27 +21,27 @@ click==8.1.7
colorama==0.4.6
# via griffe
# via mkdocs-material
contourpy==1.2.0
contourpy==1.2.1
# via matplotlib
cycler==0.12.1
# via matplotlib
fonttools==4.49.0
fonttools==4.52.4
# via matplotlib
ghp-import==2.1.0
# via mkdocs
griffe==0.41.3
griffe==0.45.2
# via mkdocstrings-python
idna==3.6
idna==3.7
# via requests
iniabu==1.1.2
# via rttools
jinja2==3.1.3
jinja2==3.1.4
# via mkdocs
# via mkdocs-material
# via mkdocstrings
kiwisolver==1.4.5
# via matplotlib
markdown==3.5.2
markdown==3.6
# via mkdocs
# via mkdocs-autorefs
# via mkdocs-material
Expand All @@ -52,26 +52,29 @@ markupsafe==2.1.5
# via mkdocs
# via mkdocs-autorefs
# via mkdocstrings
matplotlib==3.8.3
matplotlib==3.9.0
# via rimsschemedrawer
# via rttools
mergedeep==1.3.4
# via mkdocs
mkdocs==1.5.3
# via mkdocs-get-deps
mkdocs==1.6.0
# via mkdocs-autorefs
# via mkdocs-material
# via mkdocstrings
# via rimsschemedrawer
mkdocs-autorefs==1.0.1
# via mkdocstrings
mkdocs-material==9.5.12
mkdocs-get-deps==0.2.0
# via mkdocs
mkdocs-material==9.5.25
# via rimsschemedrawer
mkdocs-material-extensions==1.3.1
# via mkdocs-material
mkdocstrings==0.24.1
mkdocstrings==0.25.1
# via mkdocstrings-python
# via rimsschemedrawer
mkdocstrings-python==1.8.0
mkdocstrings-python==1.10.3
# via mkdocstrings
numpy==1.26.4
# via contourpy
Expand All @@ -82,7 +85,7 @@ numpy==1.26.4
# via rimsschemedrawer
# via rttools
# via scipy
packaging==23.2
packaging==24.0
# via matplotlib
# via mkdocs
# via qtpy
Expand All @@ -92,47 +95,48 @@ pandas==2.2.2
# via rttools
pathspec==0.12.1
# via mkdocs
pillow==10.2.0
pillow==10.3.0
# via matplotlib
pint==0.23
# via rttools
platformdirs==4.2.0
# via mkdocs
platformdirs==4.2.2
# via mkdocs-get-deps
# via mkdocstrings
pyarrow==16.1.0
# via rttools
pygments==2.17.2
pygments==2.18.0
# via mkdocs-material
pymdown-extensions==10.7.1
pymdown-extensions==10.8.1
# via mkdocs-material
# via mkdocstrings
pyparsing==3.1.1
pyparsing==3.1.2
# via matplotlib
pyqt6==6.6.1
pyqt6==6.7.0
# via rimsschemedrawer
pyqt6-qt6==6.6.2
pyqt6-qt6==6.7.0
# via pyqt6
pyqt6-sip==13.6.0
# via pyqt6
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via ghp-import
# via matplotlib
# via pandas
pytz==2024.1
# via pandas
pyyaml==6.0.1
# via mkdocs
# via mkdocs-get-deps
# via pymdown-extensions
# via pyyaml-env-tag
pyyaml-env-tag==0.1
# via mkdocs
qtpy==2.4.1
# via rimsschemedrawer
regex==2023.12.25
regex==2024.5.15
# via mkdocs-material
requests==2.31.0
requests==2.32.2
# via mkdocs-material
rttools @ git+https://github.com/trappitsch/rttools@1b91e4f1db216c5056473db2de692d7d8dcc30c3
rttools @ git+https://github.com/trappitsch/rttools@b01d4af6f767190a22e22a953e9d4ce18c7b5d9f
# via rimsschemedrawer
scipy==1.13.1
# via rttools
Expand All @@ -144,5 +148,5 @@ tzdata==2024.1
# via pandas
urllib3==2.2.1
# via requests
watchdog==4.0.0
watchdog==4.0.1
# via mkdocs
20 changes: 14 additions & 6 deletions tests/test_scheme_table.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ def test_raised_ground(data_path):
"Step",
"λ (nm)",
"From (cm⁻¹)",
"Term",
"To (cm⁻¹)",
"Term",
"Forbidden",
"Strength (s⁻¹)",
]
Expand All @@ -62,24 +64,30 @@ def test_raised_ground(data_path):
[
"1",
"400.262",
f"1000.000 ({tts('5D0')})",
f"25983.609 ({tts('5F1')})",
"1000.000",
f"{tts('5D0')}",
"25983.609",
f"{tts('5F1')}",
"",
"1.0 × 10<sup>6</sup>",
],
[
"2",
"407.469",
f"25983.609 ({tts('5F1')})",
f"50525.354 ({tts('5D2')})",
"25983.609",
f"{tts('5F1')}",
"50525.354",
f"{tts('5D2')}",
"x",
"",
],
[
"3",
"771.908",
f"50525.354 ({tts('5D2')})",
f"63480.266 ({tts('AI')})",
"50525.354",
f"{tts('5D2')}",
"63480.266",
f"{tts('AI')}",
"",
"3.0 × 10<sup>5</sup>",
],
Expand Down

0 comments on commit 646a487

Please sign in to comment.