Skip to content

Commit

Permalink
309 make pip test work in m1 mac (#310)
Browse files Browse the repository at this point in the history
* update

* fix test

* update

* update

* Update CHANGES

---------

Co-authored-by: Oliver Beckstein <[email protected]>
  • Loading branch information
xiki-tempula and orbeckst authored Apr 7, 2023
1 parent 639969e commit 2804d33
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ Fixes
- Fix the dE method in u_nk2series to use the difference between two
lambda columns instead of using the next lambda column or the previous
column for the last window (issue #299, PR #300).
- work around hanging tests on Mac M1 by using Path.glob instead of glob.glob
in ABFE workflow (issue #309, PR #310).


12/12/2022 xiki-tempula, orbeckst
Expand Down
6 changes: 3 additions & 3 deletions src/alchemlyb/workflows/abfe.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import logging
import os
from glob import glob
from os.path import join
from pathlib import Path

import matplotlib.pyplot as plt
import numpy as np
Expand Down Expand Up @@ -81,8 +81,8 @@ def __init__(
f"{suffix} under directory {dir} produced by "
f"{software}"
)
reg_exp = dir + "/**/" + prefix + "*" + suffix
self.file_list = list(glob(reg_exp, recursive=True))
reg_exp = "**/" + prefix + "*" + suffix
self.file_list = list(map(str, Path(dir).glob(reg_exp)))

if len(self.file_list) == 0:
raise ValueError(f"No file has been matched to {reg_exp}.")
Expand Down

0 comments on commit 2804d33

Please sign in to comment.