Commit e37f62dc authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

python: have %%dve and %%pml honor SPOT_TMPDIR and TMPDIR

* python/spot/aux.py (tmpdir): New context manager.
* python/spot/ltsmin.i: Use it for the two magics.
* NEWS: Mention this.
parent b136b81c
...@@ -127,6 +127,10 @@ New in spot 2.0.3a (not yet released) ...@@ -127,6 +127,10 @@ New in spot 2.0.3a (not yet released)
with spins, and dynamically load them. This is with spins, and dynamically load them. This is
akin to the %%dve magic that was already supported. akin to the %%dve magic that was already supported.
* The %%dve and %%pml magics honor the SPOT_TMPDIR and
TMPDIR environment variables. This especially helps
when the current directory is read-only.
Documentation: Documentation:
* A new example page shows how to test the equivalence of * A new example page shows how to test the equivalence of
......
...@@ -26,6 +26,7 @@ import subprocess ...@@ -26,6 +26,7 @@ import subprocess
import sys import sys
import os import os
import errno import errno
import contextlib
def extend(*classes): def extend(*classes):
""" """
...@@ -80,3 +81,13 @@ def rm_f(filename): ...@@ -80,3 +81,13 @@ def rm_f(filename):
except OSError as e: except OSError as e:
if e.errno != errno.ENOENT: if e.errno != errno.ENOENT:
raise raise
@contextlib.contextmanager
def tmpdir():
cwd = os.getcwd()
tmpdir = os.environ.get('SPOT_TMPDIR') or os.environ.get('TMPDIR') or '.'
try:
os.chdir(tmpdir)
yield
finally:
os.chdir(cwd)
...@@ -149,8 +149,7 @@ try: ...@@ -149,8 +149,7 @@ try:
def dve(self, line, cell): def dve(self, line, cell):
if not line: if not line:
raise ValueError("missing variable name for %%dve") raise ValueError("missing variable name for %%dve")
# DiViNe prefers when files are in the current directory with spot.aux.tmpdir():
# so write cell into local file
with tempfile.NamedTemporaryFile(dir='.', suffix='.dve') as t: with tempfile.NamedTemporaryFile(dir='.', suffix='.dve') as t:
t.write(cell.encode('utf-8')) t.write(cell.encode('utf-8'))
t.flush() t.flush()
...@@ -179,6 +178,7 @@ try: ...@@ -179,6 +178,7 @@ try:
def pml(self, line, cell): def pml(self, line, cell):
if not line: if not line:
raise ValueError("missing variable name for %%pml") raise ValueError("missing variable name for %%pml")
with spot.aux.tmpdir():
with tempfile.NamedTemporaryFile(dir='.', suffix='.pml') as t: with tempfile.NamedTemporaryFile(dir='.', suffix='.pml') as t:
t.write(cell.encode('utf-8')) t.write(cell.encode('utf-8'))
t.flush() t.flush()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment