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.

Sign up for GitHub

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

Check registry file hash before downloading #93

Merged
merged 15 commits into from
Apr 25, 2024
Merged

Check registry file hash before downloading #93

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
36de2b3
Add registry hash checking
OliviaLynn Apr 18, 2024
dcd6095
Add registry hash checking
OliviaLynn Apr 18, 2024
d94bfd6
Merge branch 'issue/54/registry-hash-file' of https://github.com/linc…
OliviaLynn Apr 18, 2024
ced64a5
Add unit test for registry hash match; fix reg download fn a bit
OliviaLynn Apr 18, 2024
9646d42
Simplify branching; add unit test
OliviaLynn Apr 22, 2024
e6ebbb4
Expand on http error message
OliviaLynn Apr 23, 2024
8fb5d8c
Break unit tests into sep file; cover all logic branches; organize be…
OliviaLynn Apr 24, 2024
9e70639
Merge branch 'issue/54/registry-hash-file' of https://github.com/linc…
OliviaLynn Apr 24, 2024
c288748
Add mocked file content to one of the unit tests
OliviaLynn Apr 24, 2024
cbb7e0a
Expand unit test mocking
OliviaLynn Apr 24, 2024
9bc25ed
Add last unit test (local reg exists/fail to dl hash)
OliviaLynn Apr 24, 2024
c354fe6
Change patches from dectorators to context managers, which imo does i…
OliviaLynn Apr 24, 2024
692d3e5
Modify error handling in data retrieval code
OliviaLynn Apr 24, 2024
e46196e
Simplify _check_registry_is_latest_version return
OliviaLynn Apr 25, 2024
49f7936
Update var name
OliviaLynn Apr 25, 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
8 changes: 2 additions & 6 deletions src/lephare/data_retrieval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,7 @@ def _check_registry_is_latest_version(remote_registry_url, local_registry_file):
remote_hash_response = requests.get(remote_hash_url, timeout=60)
remote_hash_response.raise_for_status() # Raise exceptions for non-200 status codes

if remote_hash_response.text.strip() == local_registry_hash:
print(f"Local registry file is up to date: {local_registry_file}")
return True
else:
print(f"Local registry file is not up to date: {local_registry_file}")
return False
return remote_hash_response.text.strip() == local_registry_hash
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nice



def download_registry_from_github(url="", outfile=""):
Expand Down Expand Up @@ -121,6 +116,7 @@ def download_registry_from_github(url="", outfile=""):

# If local registry hash matches remote hash, our registry is already up-to-date:
if os.path.isfile(outfile) and _check_registry_is_latest_version(url, outfile):
print(f"Local registry file is up to date: {local_registry_file}")
return

# Download the registry file
Expand Down
Loading