Skip to content

Commit

Permalink
Merge branch 'master' into lammps
Browse files Browse the repository at this point in the history
  • Loading branch information
jaclark5 committed Nov 12, 2024
2 parents 0e2a312 + 9e8139e commit 224ca08
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
# General information about the project.
now = datetime.datetime.now()
project = "alchemlyb"
author = 'The alchemlyb development team (see <a href="https://raw.githubusercontent.com/alchemistry/alchemlyb/master/AUTHORS">AUTHORS</a>)'
author = 'The alchemlyb development team ' \
+ '(see <a href="https://raw.githubusercontent.com/alchemistry/alchemlyb/master/AUTHORS">AUTHORS</a>)'
copyright = f"2017-{now.year}, " + author


Expand Down
6 changes: 4 additions & 2 deletions src/alchemlyb/parsing/amber.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,15 +334,17 @@ def extract(outfile, T):
if nstep != old_nstep and dvdl is not None and nstep is not None:
if finished:
raise ValueError(
"TI Energy detected after the TIMINGS section. Did you concatenate the output file?"
"TI Energy detected after the TIMINGS section."
+ " Did you concatenate the output file?"
)
file_datum.gradients.append(dvdl)
nensec += 1
old_nstep = nstep
elif line.startswith("MBAR Energy analysis") and file_datum.have_mbar:
if finished:
raise ValueError(
"MBAR Energy detected after the TIMINGS section. Did you concatenate the output file?"
"MBAR Energy detected after the TIMINGS section."
+ " Did you concatenate the output file?"
)
mbar = secp.extract_section(
"^MBAR", "^ ---", file_datum.mbar_lambdas, extra=line
Expand Down
3 changes: 2 additions & 1 deletion src/alchemlyb/parsing/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ def anyopen(datafile: Union[PathLike, IO], mode="r", compression=None):
return compressor(datafile, mode=mode)
else:
raise ValueError(
"`datafile` is a stream, but specified `compression` '{compression}' is not supported"
"`datafile` is a stream"
+ ", but specified `compression` '{compression}' is not supported"
)

# otherwise, treat as a file
Expand Down

0 comments on commit 224ca08

Please sign in to comment.