From 64e03a111896c928208f8e3d23149632b72f9222 Mon Sep 17 00:00:00 2001 From: Paulo Meira <10246101+PMeira@users.noreply.github.com> Date: Sun, 17 Feb 2019 18:32:55 -0300 Subject: [PATCH] Use dss_python==0.10.1 (#54) * Update dss_python to 0.10.1. * Update tests to use os.linesep -- fixed in DSS C-API 0.10.1, previous was always `\r\n`, independent of the OS. * Increment version (micro). --- opendssdirect/_version.py | 2 +- setup.py | 2 +- tests/test_opendssdirect.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opendssdirect/_version.py b/opendssdirect/_version.py index 6acf8bb..0adef98 100644 --- a/opendssdirect/_version.py +++ b/opendssdirect/_version.py @@ -1,2 +1,2 @@ # -*- coding: utf-8 -*- -__version__ = "0.3.6" +__version__ = "0.3.7" diff --git a/setup.py b/setup.py index e06bb35..99476ce 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ def run(self): author_email="me@kdheepak.com", license="BSD-compatible", packages=find_packages(), - install_requires=["future", "six", "dss_python==0.10.0"], + install_requires=["future", "six", "dss_python==0.10.1"], extras_require={ "extras": ["pandas", "matplotlib", "networkx"], "dev": [ diff --git a/tests/test_opendssdirect.py b/tests/test_opendssdirect.py index 1151f91..2d8aed2 100644 --- a/tests/test_opendssdirect.py +++ b/tests/test_opendssdirect.py @@ -1538,8 +1538,8 @@ def test_13Node_Element(dss): def test_13Node_Executive(dss): assert dss.Executive.Command(1) == u"New" assert ( - dss.Executive.CommandHelp(1) - == u"Create a new object within the DSS. Object becomes the active object\r\nExample: New Line.line1 ..." + dss.Executive.CommandHelp(1).replace(os.linesep, '\n') + == u"Create a new object within the DSS. Object becomes the active object\nExample: New Line.line1 ..." ) assert ( dss.Executive.NumCommands() == 107 @@ -2021,8 +2021,8 @@ def test_13Node_PDElements(dss): def test_13Node_Properties(dss): # TODO!! rework DSSProperty dss.dss_lib.DSSProperty_Set_Index(0) # TODO? assert ( - dss.Properties.Description() - == u"Name of bus to which first terminal is connected.\r\nExample:\r\nbus1=busname (assumes all terminals connected in normal phase order)\r\nbus1=busname.3.1.2.0 (specify terminal to node connections explicitly)" + dss.Properties.Description().replace(os.linesep, '\n') + == u"Name of bus to which first terminal is connected.\nExample:\nbus1=busname (assumes all terminals connected in normal phase order)\nbus1=busname.3.1.2.0 (specify terminal to node connections explicitly)" ) assert dss.Properties.Name() == u"bus1"