Skip to content

Dirty workaround for some string actions on pathlib obj. #194

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

Merged
merged 6 commits into from
Nov 27, 2020
Merged

Dirty workaround for some string actions on pathlib obj. #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
112b730
Dirty workaround for some string actions on pathlib obj.
briochh Nov 25, 2020
d3e3f35
use str() on path object
briochh Nov 25, 2020
f2c42d2
more path to str tidy
briochh Nov 25, 2020
c523af4
Merge remote-tracking branch 'briochh/hotfix_pathlib_v2write' into ho…
briochh Nov 25, 2020
959dda6
undo typo introduction
briochh Nov 25, 2020
80ef784
Merge branch 'develop' of https://github.com/pypest/pyemu into hotfix…
briochh Nov 26, 2020
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
5 changes: 3 additions & 2 deletions autotest/pst_from_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@ def mf6_freyberg_da_test():
print(pf.org_files)

# build pest
pst = pf.build_pst('freyberg.pst')
pst = pf.build_pst('freyberg.pst', version=2)
pst.write(os.path.join(template_ws,"freyberg6_da.pst"),version=2)


Expand Down Expand Up @@ -2388,8 +2388,9 @@ def test_get_filepath():
#freyberg_prior_build_test()
#mf6_freyberg_test()
#mf6_freyberg_shortnames_test()
# mf6_freyberg_da_test()
mf6_freyberg_da_test()
#mf6_freyberg_direct_test()
#mf6_freyberg_varying_idomain()
#xsec_test()
mf6_freyberg_short_direct_test()

1 change: 1 addition & 0 deletions pyemu/pst/pst_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,6 +1488,7 @@ def sanity_checks(self):

def _write_version2(self, new_filename, use_pst_path=True, pst_rel_path="."):
pst_path = None
new_filename = str(new_filename) # ensure convert to str
if use_pst_path:
pst_path, _ = Pst._parse_path_agnostic(new_filename)
if pst_rel_path == ".":
Expand Down
9 changes: 5 additions & 4 deletions pyemu/utils/pst_from.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1345,7 +1345,7 @@ def add_parameters(
par_data_cols = pyemu.pst_utils.pst_config["par_fieldnames"]
self.logger.log(
"adding {0} type {1} style parameters for file(s) {2}".format(
par_type, par_style, str(filenames)
par_type, par_style, [str(f) for f in filenames]
)
)
if geostruct is not None:
Expand Down Expand Up @@ -1875,8 +1875,9 @@ def add_parameters(
# variograms=v)

self.logger.log(
"adding {0} type {1} style parameters for file(s) {2}"
"".format(par_type, par_style, str(filenames))
"adding {0} type {1} style parameters for file(s) {2}".format(
par_type, par_style, [str(f) for f in filenames]
)
)

if rebuild_pst: # may want to just update pst and rebuild
Expand Down Expand Up @@ -2923,4 +2924,4 @@ def get_relative_filepath(folder, filename):
"""Like :func:`~pyemu.utils.pst_from.get_filepath`, except
return path for filename relative to folder.
"""
return get_filepath(folder, filename).relative_to(folder)
return get_filepath(folder, filename).relative_to(folder)