Skip to content

Commit

Permalink
file paths bugfixes for Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
francoislaurent committed Jan 14, 2021
1 parent 82e9706 commit 600bf26
Show file tree
Hide file tree
Showing 6 changed files with 122 additions and 104 deletions.
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def __getattr__(cls, name):
# built documents.
#
# The short X.Y version.
version = u'0.5-rc3'
version = u'0.5-rc4'
# The full version, including alpha/beta/rc tags.
release = u'0.5'

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

setup(
name = 'tramway',
version = '0.5-rc3',
version = '0.5-rc4',
description = 'TRamWAy',
long_description = long_description,
url = 'https://github.com/DecBayComp/TRamWAy',
Expand Down
12 changes: 5 additions & 7 deletions tests/test_analyzer_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@ def map(self):
with open(script_name, 'w') as f:
f.write(script(env))
f.write('a.run()\n')
out = subprocess.check_output([sys.executable, script_name], encoding='utf8', timeout=60)
out = subprocess.check_output([sys.executable, script_name], encoding='utf8', timeout=120)
logger.info(out)
with open(script_name, 'w') as f:
f.write(script())
f.write(test)
out = subprocess.check_output([sys.executable, script_name], encoding='utf8', timeout=30)
out = subprocess.check_output([sys.executable, script_name], encoding='utf8', timeout=60)
logger.info(out)
assert out.endswith("""\
<class 'pandas.core.frame.DataFrame'>
Expand All @@ -129,16 +129,14 @@ def test_LocalHost(self, tmpdir, dynamicmesh):
env = "a.env = environments.LocalHost"
run_script1(tmpdir, dynamicmesh, env)
def test_GPULab(self, tmpdir, dynamicmesh):
with open(os.path.join(os.path.dirname(__file__), 'credentials'), 'r') as f:
with open(os.path.join(os.path.dirname(__file__), 'maestro.credentials'), 'r') as f:
username = f.readline().rstrip()
password = f.readline().rstrip()
env = """\
a.env = environments.GPULab
a.env = environments.Maestro
a.env.username = '{username}'
a.env.ssh._password = '{password}'
a.env.container = 'tramway-hpc-210111.sif'
#a.env.debug = True
a.env.sbatch_options.update(dict(p='dbc'))\
#a.env.sbatch_options.update(dict(p='dbc'))\
""".format(username=username, password=password)
# options = """,
# sbatch_options=dict(c=a.mapper.worker_count)\
Expand Down
2 changes: 1 addition & 1 deletion tramway/analyzer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ def logger(self):
import logging
self._logger = logging.getLogger(__name__)
if not self._logger.hasHandlers():
self._logger.setLevel(logging.DEBUG)
self._logger.setLevel(logging.INFO)
self._logger.addHandler(logging.StreamHandler())
return self._logger
@logger.setter
Expand Down

0 comments on commit 600bf26

Please sign in to comment.