Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3.11"
python: "3.13"

# Build documentation in the docs/ directory with Sphinx
sphinx:
Expand Down
1 change: 1 addition & 0 deletions Changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Summary of all changes made since the first stable release
* ENH: Added `to_dict` method to the boundary class objects
* ENH: Added Starkov (1994) auroral model
* ENH: Adapted boundary classes to accept model boundaries
* BUG: Supported newest version of zenodo_get, which underwent breaking changes

0.5.0 (01-28-2025)
------------------
Expand Down
15 changes: 10 additions & 5 deletions ocbpy/boundaries/dmsp_ssj_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,13 @@ def fetch_ssj_boundary_files(stime=None, etime=None, out_dir=None,
sys.stdout = zenodo_io
sys.stderr = zenodo_io

zenodo_checksum = os.path.join(out_dir, 'md5sums.txt')
zenodo_get.zenodo_get([doi, '-o', out_dir])
# TODO(#151): remove the old (second) way of calling zenodo_get
if hasattr(zenodo_get, "download"):
zenodo_get.download(doi=doi, output_dir=out_dir)
zenodo_checksum = None
else:
zenodo_get.zenodo_get([doi, '-o', out_dir])
zenodo_checksum = os.path.join(out_dir, 'md5sums.txt')

# Parse the output and retrieve files from the zip archive
sys.stdout = sys.__stdout__
Expand All @@ -124,11 +129,11 @@ def fetch_ssj_boundary_files(stime=None, etime=None, out_dir=None,

if zen_msg.find('Checksum is correct') < 0 and zen_msg.find(
'already downloaded correctly') < 0:
raise IOError('Bad checksum, see: {:s}\n{:s}'.format(zenodo_checksum,
zen_msg))
raise IOError('Bad checksum: {:s}'.format(zen_msg))

# Remove the checksum file if the download problem wasn't found there
os.remove(zenodo_checksum)
if zenodo_checksum is not None:
os.remove(zenodo_checksum)

# Get the archive name from the output
try:
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ doc = [
"pysat>=3.2.1",
"sphinx>=1.3",
"sphinx-rtd-theme",
"zenodo-get",
]
test = [
"coverage[toml]",
Expand Down