Skip to content

Commit

Permalink
fixes as iirrational was testing
Browse files Browse the repository at this point in the history
  • Loading branch information
mccullerlp committed Jan 27, 2018
1 parent 2ab95ab commit 8f51cfe
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
2 changes: 2 additions & 0 deletions msurrogate/+msurrogate/mat2py.m
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
switch class(object)
case 'msurrogate.pywrap'
varargout{1} = pyraw(object);
case 'msurrogate.pyrowrap'
varargout{1} = pyraw(object);
case 'struct'
varargout{1} = struct2py(object);
case 'cell'
Expand Down
6 changes: 3 additions & 3 deletions msurrogate/auto_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
AUTOGENERATED by git post-commit hook. Note that these are always from the PREVIOUS commit, and so may be out of date by one log entry
"""
git_branch = "master"
git_shorthash = "8d48b87"
git_longhash = "8d48b8705c160f285ae903d828843ef6d7e717a5"
git_last_tag = "0.9.0.dev1"
git_shorthash = "2ab95ab"
git_longhash = "2ab95ab39486df1a39fec09a9a5da2e97fae639e"
git_last_tag = "0.9.0.dev2"
1 change: 0 additions & 1 deletion msurrogate/meta_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ def pyrometa_setitem(self, idx, val):
return

def pyrometa_call(self, name, *args, **kwargs):
print(name, args, kwargs)
if name is None:
val = self.obj
else:
Expand Down
9 changes: 5 additions & 4 deletions msurrogate/subproc_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"""
from __future__ import division, print_function, unicode_literals
import sys
import os
import json
import uuid
import subprocess
Expand Down Expand Up @@ -30,15 +31,15 @@ def __init__(

#update the environment and clear variables with None
if env is not None:
env = dict(sys.environ)
env_use = dict(os.environ)
for k, v in env.items():
if v is None:
try:
del env[k]
del env_use[k]
except KeyError:
pass
else:
env[k] = v
env_use[k] = v

if python_call is None:
python_call = sys.executable
Expand All @@ -53,7 +54,7 @@ def __init__(
stdout = subprocess.PIPE,
stdin = subprocess.PIPE,
stderr = subprocess.PIPE,
env = env,
env = env_use,
bufsize=1,
)

Expand Down
2 changes: 1 addition & 1 deletion msurrogate/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"""
from __future__ import division, print_function, unicode_literals

version = '0.9.0.dev2'
version = '0.9.0.dev3'
__version__ = version

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from distutils.command.bdist import bdist
from distutils.command.sdist import sdist

version = '0.9.0.dev2'
version = '0.9.0.dev3'

def check_versions():
print('versions checked')
Expand Down

0 comments on commit 8f51cfe

Please sign in to comment.