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

Migrate verdi calculation to use the click infrastructure #1667

Merged
merged 2 commits into from
Jun 19, 2018

Conversation

sphuber
Copy link
Contributor

@sphuber sphuber commented Jun 19, 2018

Fixes #1579

@sphuber sphuber requested review from DropD and giovannipizzi June 19, 2018 15:00
@sphuber sphuber force-pushed the fix_1579_migrate_verdi_calculation branch 3 times, most recently from fa52e06 to 8255d0f Compare June 19, 2018 19:44
@sphuber sphuber force-pushed the fix_1579_migrate_verdi_calculation branch from 8255d0f to 431e9d1 Compare June 19, 2018 20:22
@codecov-io
Copy link

codecov-io commented Jun 19, 2018

Codecov Report

Merging #1667 into verdi will increase coverage by 0.54%.
The diff coverage is 72.35%.

Impacted file tree graph

@@            Coverage Diff             @@
##            verdi    #1667      +/-   ##
==========================================
+ Coverage   59.63%   60.17%   +0.54%     
==========================================
  Files         295      294       -1     
  Lines       34594    34065     -529     
==========================================
- Hits        20629    20500     -129     
+ Misses      13965    13565     -400
Impacted Files Coverage Δ
aiida/orm/data/remote.py 40.2% <0%> (+2.34%) ⬆️
aiida/transport/transport.py 60.8% <100%> (+0.59%) ⬆️
aiida/cmdline/params/options/__init__.py 100% <100%> (ø) ⬆️
aiida/cmdline/commands/rehash.py 90.62% <100%> (+0.96%) ⬆️
...implementation/general/calculation/job/__init__.py 43.63% <100%> (+5.19%) ⬆️
aiida/cmdline/commands/daemon.py 28.94% <100%> (ø) ⬆️
aiida/cmdline/commands/node.py 50.88% <100%> (-1.18%) ⬇️
...rm/calculation/job/simpleplugins/arithmetic/add.py 34.93% <100%> (+13.95%) ⬆️
aiida/cmdline/commands/work.py 73.51% <100%> (-1.26%) ⬇️
aiida/cmdline/commands/restapi.py 65% <100%> (ø) ⬆️
... and 21 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee0aa10...f8dc350. Read the comment docs.

@sphuber
Copy link
Contributor Author

sphuber commented Jun 19, 2018

This PR is ready and the tests are passing. @giovannipizzi @DropD ready for review

aiida/orm/data/cif.py|
aiida/restapi/resources.py|
aiida/restapi/translator/data/cif.py|
aiida/utils/fixtures.py
aiida/utils/fixtures.py|
docs/update_req_for_rtd.py| # a|b -> match a OR b
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure it should finish with a vertical pipe |

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only for that line, or for all of them?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I understand the syntax, the | is an "OR" so it should be everywhere except the last line (btw I'm still not convinced that the syntax is perfectly ok - e.g. the dot probably matches any character?)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yes I did not recognize that you meant the last line. I think you are right and I removed it. The dot should indeed match any character. I tried removing it before the wildcard and then it does not match anything. It really seems to work like a regex pattern then

aiida/utils/fixtures.py
aiida/restapi/translator/data/cif.py|
aiida/utils/fixtures.py|
docs/update_req_for_rtd.py|
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

@@ -50,7 +50,6 @@ class JobCalculationFinishStatus(enum.Enum):
RETRIEVALFAILED = 200
PARSINGFAILED = 300
FAILED = 400
I_AM_A_TEAPOT = 418
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting old state ;-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I put that in when it was still the workflows branch. Thought it best to just remove it now before someone gets hurt :)

@@ -48,6 +48,17 @@ def test_basic(self):
with LocalTransport():
pass

def test_is_open(self):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test should probably be defined in test_all_plugins.py with the @run_for_all_plugins decorator?

@@ -57,6 +57,17 @@ def test_no_host_key(self):
# Reset logging level
logging.disable(logging.NOTSET)

def test_is_open(self):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as the analogous test in test_local.py

Copy link
Member

@giovannipizzi giovannipizzi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apart from the few minor comments, it looks ok!

@sphuber sphuber merged commit f685844 into aiidateam:verdi Jun 19, 2018
@sphuber sphuber deleted the fix_1579_migrate_verdi_calculation branch June 19, 2018 21:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants