Skip to content

Windows compatibility #88

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

Open
rantahar wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Windows compatibility #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0b8437
Os independent join in SSHChannel
Nov 29, 2018
c88bdb0
Force posix line endings in ClusterProvider._write_submit_script
Nov 29, 2018
aa9a2b2
Os independent join in LocalChannel
Nov 29, 2018
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 libsubmit/channels/local/local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def push_file(self, source, dest_dir):
- FileCopyException : If file copy failed.
'''

local_dest = dest_dir + '/' + os.path.basename(source)
local_dest = os.path.join(dest_dir, os.path.basename(source))

# Only attempt to copy if the target dir and source dir are different
if os.path.dirname(source) != dest_dir:
Expand Down
2 changes: 1 addition & 1 deletion libsubmit/channels/ssh/ssh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ def pull_file(self, remote_source, local_dir):
- FileCopyException : FileCopy failed.
'''

local_dest = local_dir + '/' + os.path.basename(remote_source)
local_dest = os.path.join(local_dir, os.path.basename(remote_source))

try:
os.makedirs(local_dir)
Expand Down
3 changes: 2 additions & 1 deletion libsubmit/providers/cluster_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,9 @@ def _write_submit_script(self, template, script_filename, job_name, configs):

try:
submit_script = Template(template).substitute(jobname=job_name, **configs)
submit_script = submit_script.replace("\r\n", "\n")
# submit_script = Template(template).safe_substitute(jobname=job_name, **configs)
with open(script_filename, 'w') as f:
with open(script_filename, 'wb') as f:
f.write(submit_script)

except KeyError as e:
Expand Down