Issue 45 #82
Issue 45 #82
Conversation
Mypy raised errors when a variable is used to hold two different types. These were fixed by introduction a new variable instead of reassigning the old one. The type annotation for get_status_detailed is changed to reflect that 'time_left' is cast to an integer. In get_status_simple it is still returned as a string, which is inconsistent, but I will leave this decision up to someone who knows the API better.
Pretty straightforward type annotations, with a couple uses of the vague "Any" type with complicated dicts.
Make some minimal changes to fix mypy errors. One common type is when a variable is reassigned. In another case, mypy wanted a variable to be explicitly annotated. I also fixed an error (not sure if an actual funcitonal error, but it was flagged by mypy) where the & operator was used with two incompatible types.
| old_machine_split = status_string.split("\n") #type: List[str] | ||
| old_machine_split[0] += machine_name | ||
| status_lines = status_string.split("\n") #type: List[str] | ||
| status_lines[0] += machine_name |
There was a problem hiding this comment.
This is another instance where I normally wouldn't have renamed this variable, but my changes conflicted with someone else who renamed it, and I think the name status_lines is clearer.
| from typing import List, Dict, Tuple, Any | ||
| from bs4 import BeautifulSoup, SoupStrainer | ||
| from typing import Any, Dict, List, Tuple | ||
| from bs4 import BeautifulSoup, SoupStrainer, Tag, ResultSet |
There was a problem hiding this comment.
Rebase conflicts... I just tend to put things in alphabetical order.
| @@ -19,7 +19,6 @@ | |||
|
|
|||
| import requests | |||
| from bs4 import BeautifulSoup | |||
|
|
|||
There was a problem hiding this comment.
Normally I wouldn't impose my style on the project, but I already had this committed and this stuck around after rebasing...
| self.assertEqual(closed[key], 0) | ||
| self.assertEqual(open[key], 1) | ||
| self.assertEqual(closed[key], '0') | ||
| self.assertEqual(open[key], '1') |
There was a problem hiding this comment.
These are all cast to strings here: https://github.com/Pitt-CSC/PittAPI/pull/82/files#diff-1c156c9a7cf25c89ef4fd8323d5c4d35L66
|
This is awesome! I will merge this PR, and then you can continue with this to avoid conflicts :) Thank you! |
Changes:
lab_test.test_make_statusReferences:
I was planning on annotating the entire project before making a pull request, but I'm encountering a painful amount of merge conflicts and want to get this in sooner than later. I'm happy to make any changes as needed.