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

Release v0.6 #149

Merged
merged 41 commits into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
b64c0b6
Add documentation for D3D parameter methods
lajz May 14, 2024
d4106ae
bump dev version
gtrevisan May 17, 2024
ea21973
prerun pylint in PRs
gtrevisan May 17, 2024
1d390d6
output code rating as summary
gtrevisan May 17, 2024
f7f871c
drop output and RC from pre-run
gtrevisan May 17, 2024
d0ae02c
Merge pull request #148 from MIT-PSFC/tests-pylint
gtrevisan May 17, 2024
0a0f295
fix condition for pre-running pylint
gtrevisan May 17, 2024
958bedf
fix C0121 (#150)
gtrevisan May 17, 2024
e5fa966
move eqtools and profiletools imports in function
gtrevisan May 20, 2024
d39ba6b
remove unused imports
gtrevisan May 20, 2024
e0e784d
apply isort
gtrevisan May 20, 2024
a41d293
further import fixes
gtrevisan May 20, 2024
e9259c6
fix cyclic import
gtrevisan May 21, 2024
983a51c
add shebangs
gtrevisan May 21, 2024
eb73cb4
further import fixes, to be revisited
gtrevisan May 21, 2024
3f7cb19
Fix exception type import for old mdsplus error type
lajz May 25, 2024
3e1aedf
add simple makefile
gtrevisan May 28, 2024
a3e5326
add reinstall target
gtrevisan May 28, 2024
f913957
Merge pull request #157 from MIT-PSFC/add-makefile
gtrevisan May 28, 2024
b39ba22
Fix error type catch statements
lajz May 28, 2024
c146fe8
reapply isort
gtrevisan May 28, 2024
5590f32
Merge pull request #156 from MIT-PSFC/fix-imports
gtrevisan May 29, 2024
c96bffc
merge update-deps onto dev
gtrevisan Jun 5, 2024
dee32f1
update deps
gtrevisan Jun 5, 2024
65213c1
lock deps
gtrevisan Jun 5, 2024
c161218
merge main-deps onto dev
gtrevisan Jun 5, 2024
1c7569c
fixup! merge main-deps onto dev
gtrevisan Jun 5, 2024
6ea8412
Merge pull request #166 from MIT-PSFC/update-deps
gtrevisan Jun 5, 2024
ec42e2a
Shorten long lines
lajz Jun 6, 2024
55c1113
Merge pull request #151 from MIT-PSFC/jlorincz/d3d_doc_improvements
gtrevisan Jun 6, 2024
7e62d8d
Jlorincz/fix pd concat (#153)
lajz Jun 7, 2024
dcbc884
More clear python testing logging (#171)
lajz Jun 11, 2024
81d01a0
Jlorincz/temp files + shot settings from dict (#154)
lajz Jun 13, 2024
22f96ab
Jlorincz/fix sql writeback (#152)
lajz Jun 14, 2024
922fb5d
Add shot id argument for testing (#179)
amdecker Jun 24, 2024
43a6df3
Wei_ip_prog_fix (#181)
yumouwei Jun 25, 2024
c90e972
Change defaults of interp1 (#201)
gtrevisan Jul 2, 2024
952b91b
fix greenwald fraction (#186)
yumouwei Jul 2, 2024
97c6031
Fix EFIT source tree in prad peaking computation (#200)
yumouwei Jul 2, 2024
ef9286c
add parameters to interpolation in Greenwald_fraction (#202)
yumouwei Jul 2, 2024
afbc370
update and lock deps (#204)
gtrevisan Jul 8, 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
17 changes: 16 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,26 @@ jobs:
steps:

- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install requirements
run: |
pip install -r .pip/main.txt -r .pip/dev.txt -r .pip/lab.txt
pip install -e .

- name: Pre-run pylint
if: |
github.event_name == 'pull_request' &&
github.event.pull_request.draft == false
run: |
git reset --hard "${{ github.event.pull_request.base.sha }}"
git log -1
pylint disruption_py examples tests \
| grep '^Your code has been rated'
git reset --hard "${{ github.event.pull_request.head.sha }}"
git log -1

- name: Run pylint
run: |
pylint --version
Expand All @@ -74,7 +88,8 @@ jobs:
- name: Print final summary
run: |
tail pylint.log \
| grep '^Your code has been rated'
| grep '^Your code has been rated' \
| tee -a "$GITHUB_STEP_SUMMARY"


shellcheck:
Expand Down
218 changes: 109 additions & 109 deletions .pip/all.txt

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions .pip/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ mccabe==0.7.0 ; python_version >= "3.9" and python_version < "4.0" \
mypy-extensions==1.0.0 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d \
--hash=sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782
packaging==24.0 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \
--hash=sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9
packaging==24.1 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \
--hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
pathspec==0.12.1 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08 \
--hash=sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712
Expand All @@ -60,9 +60,9 @@ platformdirs==4.2.2 ; python_version >= "3.9" and python_version < "4.0" \
pluggy==1.5.0 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 \
--hash=sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669
pylint==3.2.2 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:3f8788ab20bb8383e06dd2233e50f8e08949cfd9574804564803441a4946eab4 \
--hash=sha256:d068ca1dfd735fb92a07d33cb8f288adc0f6bc1287a139ca2425366f7cbe38f8
pylint==3.2.5 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:32cd6c042b5004b8e857d727708720c54a676d1e22917cf1a2df9b4d4868abd6 \
--hash=sha256:e9b7171e242dcc6ebd0aaa7540481d1a72860748a0a7816b8fe6cf6c80a6fe7e
pytest==8.2.2 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:c434598117762e2bd304e526244f67bf66bbd7b5d6cf22138be51ff661980343 \
--hash=sha256:de4bb8104e201939ccdc688b27a89a7be2079b22e2bd2b07f806b6ba71117977
Expand Down Expand Up @@ -113,9 +113,9 @@ tomli==2.0.1 ; python_version >= "3.9" and python_version < "3.11" \
tomlkit==0.12.5 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:af914f5a9c59ed9d0762c7b64d3b5d5df007448eb9cd2edc8a46b1eafead172f \
--hash=sha256:eef34fba39834d4d6b73c9ba7f3e4d1c417a4e56f89a7e96e090dd0d24b8fb3c
typing-extensions==4.12.1 ; python_version >= "3.9" and python_version < "3.11" \
--hash=sha256:6024b58b69089e5a89c347397254e35f1bf02a907728ec7fee9bf0fe837d203a \
--hash=sha256:915f5e35ff76f56588223f15fdd5938f9a1cf9195c0de25130c627e4d597f6d1
typing-extensions==4.12.2 ; python_version >= "3.9" and python_version < "3.11" \
--hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
--hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8
yamllint==1.35.1 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:2e16e504bb129ff515b37823b472750b36b6de07963bd74b307341ef5ad8bdc3 \
--hash=sha256:7a003809f88324fd2c877734f2d575ee7881dd9043360657cc8049c809eba6cd
60 changes: 30 additions & 30 deletions .pip/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ black==24.4.2 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:e151054aa00bad1f4e1f04919542885f89f5f7d086b8a59e5000e6c616896ffb \
--hash=sha256:eaea3008c281f1038edb473c1aa8ed8143a5535ff18f978a318f10302b254063 \
--hash=sha256:ef703f83fc32e131e9bcc0a5094cfe85599e7109f896fe8bc96cc402f3eb4b6e
certifi==2024.6.2 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516 \
--hash=sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56
certifi==2024.7.4 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
--hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
charset-normalizer==3.3.2 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \
--hash=sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087 \
Expand Down Expand Up @@ -127,15 +127,15 @@ colorama==0.4.6 ; python_version >= "3.9" and python_version < "4.0" \
ghp-import==2.1.0 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:8337dd7b50877f163d4c0289bc1f1c7f127550241988d568c1db512c4324a619 \
--hash=sha256:9c535c4c61193c2df8871222567d7fd7e5014d835f97dc7b7439069e2413d343
griffe==0.45.2 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:297ec8530d0c68e5b98ff86fb588ebc3aa3559bb5dc21f3caea8d9542a350133 \
--hash=sha256:83ce7dcaafd8cb7f43cbf1a455155015a1eb624b1ffd93249e5e1c4a22b2fdb2
griffe==0.47.0 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:07a2fd6a8c3d21d0bbb0decf701d62042ccc8a576645c7f8799fe1f10de2b2de \
--hash=sha256:95119a440a3c932b13293538bdbc405bee4c36428547553dc6b327e7e7d35e5a
idna==3.7 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
--hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
importlib-metadata==7.1.0 ; python_version >= "3.9" and python_version < "3.10" \
--hash=sha256:30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570 \
--hash=sha256:b78938b926ee8d5f020fc4772d487045805a55ddbad2ecf21c6d60938dc7fcd2
importlib-metadata==8.0.0 ; python_version >= "3.9" and python_version < "3.10" \
--hash=sha256:15584cf2b1bf449d98ff8a6ff1abef57bf20f3ac6454f431736cd3e660921b2f \
--hash=sha256:188bd24e4c346d3f0a933f275c2fec67050326a856b9a359881d7c2a697e8812
jinja2==3.1.4 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369 \
--hash=sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d
Expand Down Expand Up @@ -218,27 +218,27 @@ mkdocs-literate-nav==0.6.1 ; python_version >= "3.9" and python_version < "4.0"
mkdocs-material-extensions==1.3.1 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:10c9511cea88f568257f960358a467d12b970e1f7b2c0e5fb2bb48cab1928443 \
--hash=sha256:adff8b62700b25cb77b53358dad940f3ef973dd6db797907c49e3c2ef3ab4e31
mkdocs-material==9.5.25 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:68fdab047a0b9bfbefe79ce267e8a7daaf5128bcf7867065fcd201ee335fece1 \
--hash=sha256:d0662561efb725b712207e0ee01f035ca15633f29a64628e24f01ec99d7078f4
mkdocs-material==9.5.28 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:9cba305283ad1600e3d0a67abe72d7a058b54793b47be39930911a588fe0336b \
--hash=sha256:ff48b11b2a9f705dd210409ec3b418ab443dd36d96915bcba45a41f10ea27bfd
mkdocs==1.6.0 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:1eb5cb7676b7d89323e62b56235010216319217d4af5ddc543a91beb8d125ea7 \
--hash=sha256:a73f735824ef83a4f3bcb7a231dcab23f5a838f88b7efc54a0eef5fbdbc3c512
mkdocstrings-python==1.10.0 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:71678fac657d4d2bb301eed4e4d2d91499c095fd1f8a90fa76422a87a5693828 \
--hash=sha256:ba833fbd9d178a4b9d5cb2553a4df06e51dc1f51e41559a4d2398c16a6f69ecc
mkdocstrings==0.24.3 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:5c9cf2a32958cd161d5428699b79c8b0988856b0d4a8c5baf8395fc1bf4087c3 \
--hash=sha256:f327b234eb8d2551a306735436e157d0a22d45f79963c60a8b585d5f7a94c1d2
mkdocstrings[python]==0.24.3 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:5c9cf2a32958cd161d5428699b79c8b0988856b0d4a8c5baf8395fc1bf4087c3 \
--hash=sha256:f327b234eb8d2551a306735436e157d0a22d45f79963c60a8b585d5f7a94c1d2
mkdocstrings-python==1.10.5 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:92e3c588ef1b41151f55281d075de7558dd8092e422cb07a65b18ee2b0863ebb \
--hash=sha256:acdc2a98cd9d46c7ece508193a16ca03ccabcb67520352b7449f84b57c162bdf
mkdocstrings==0.25.1 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:c3a2515f31577f311a9ee58d089e4c51fc6046dbd9e9b4c3de4c3194667fe9bf \
--hash=sha256:da01fcc2670ad61888e8fe5b60afe9fee5781017d67431996832d63e887c2e51
mkdocstrings[python]==0.25.1 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:c3a2515f31577f311a9ee58d089e4c51fc6046dbd9e9b4c3de4c3194667fe9bf \
--hash=sha256:da01fcc2670ad61888e8fe5b60afe9fee5781017d67431996832d63e887c2e51
mypy-extensions==1.0.0 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d \
--hash=sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782
packaging==24.0 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \
--hash=sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9
packaging==24.1 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \
--hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
paginate==0.5.6 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:5e6007b6a9398177a7e1648d04fdd9f8c9766a1a945bceac82f1929e8c78af2d
pathspec==0.12.1 ; python_version >= "3.9" and python_version < "4.0" \
Expand Down Expand Up @@ -389,12 +389,12 @@ six==1.16.0 ; python_version >= "3.9" and python_version < "4.0" \
tomli==2.0.1 ; python_version >= "3.9" and python_version < "3.11" \
--hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
--hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
typing-extensions==4.12.1 ; python_version >= "3.9" and python_version < "3.11" \
--hash=sha256:6024b58b69089e5a89c347397254e35f1bf02a907728ec7fee9bf0fe837d203a \
--hash=sha256:915f5e35ff76f56588223f15fdd5938f9a1cf9195c0de25130c627e4d597f6d1
urllib3==2.2.1 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d \
--hash=sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19
typing-extensions==4.12.2 ; python_version >= "3.9" and python_version < "3.11" \
--hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
--hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8
urllib3==2.2.2 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
--hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
watchdog==4.0.1 ; python_version >= "3.9" and python_version < "4.0" \
--hash=sha256:0144c0ea9997b92615af1d94afc0c217e07ce2c14912c7b1a5731776329fcfc7 \
--hash=sha256:03e70d2df2258fb6cb0e95bbdbe06c16e608af94a3ffbd2b90c3f1e83eb10767 \
Expand Down
Loading