2.7.2-rc

JamesParrott · Dec 5, 2023 · c5f969a · c5f969a
1 parent 7d0a3b2
commit c5f969a
Show file tree

Hide file tree

Showing 26 changed files with 35 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ sDNA_GH:
  - Displays the results from sDNA by colouring a new layer of new polylines or the original ones.
 
 ## User manual.  
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 ## Table of contents
 

diff --git a/dev/tests/create_random_grid_network.py b/dev/tests/create_random_grid_network.py
@@ -28,7 +28,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 from random import random as random_num
 from math import trunc as floor  # for an int, not a float.  math.floor(2.33) == 2.0;  math.trunc(2.33) == 2

diff --git a/sDNA_GH/custom/data_cruncher.py b/sDNA_GH/custom/data_cruncher.py
@@ -37,7 +37,7 @@
 """
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 import logging
 import warnings

diff --git a/sDNA_GH/custom/gdm_from_GH_Datatree.py b/sDNA_GH/custom/gdm_from_GH_Datatree.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 
 import logging

diff --git a/sDNA_GH/custom/logging_wrapper.py b/sDNA_GH/custom/logging_wrapper.py
@@ -27,7 +27,7 @@
 # SOFTWARE.
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 import sys
 import os

diff --git a/sDNA_GH/custom/options_manager.py b/sDNA_GH/custom/options_manager.py
@@ -28,7 +28,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 """
 Functions to override namedtuples, from dicts, toml files 
 and other named tuples e.g. for options data structures.

diff --git a/sDNA_GH/custom/pyshp_wrapper.py b/sDNA_GH/custom/pyshp_wrapper.py
@@ -28,7 +28,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 """ Reads .shp files, and parses data and writes .shp files from any iterable.   
 """
 

diff --git a/sDNA_GH/custom/skel/add_params.py b/sDNA_GH/custom/skel/add_params.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 from collections import OrderedDict
 import logging

diff --git a/sDNA_GH/custom/skel/basic/ghdoc.py b/sDNA_GH/custom/skel/basic/ghdoc.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 
 import Rhino

diff --git a/sDNA_GH/custom/skel/basic/quacks_like.py b/sDNA_GH/custom/skel/basic/quacks_like.py
@@ -1,7 +1,7 @@
 #! /usr/bin/python
 # -*- coding: utf-8 -*-
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 
 import abc

diff --git a/sDNA_GH/custom/skel/basic/smart_comp.py b/sDNA_GH/custom/skel/basic/smart_comp.py
@@ -50,7 +50,7 @@
 """
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 import logging
 import inspect

diff --git a/sDNA_GH/custom/skel/builder.py b/sDNA_GH/custom/skel/builder.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 import os
 import shutil

diff --git a/sDNA_GH/custom/skel/tools/helpers/checkers.py b/sDNA_GH/custom/skel/tools/helpers/checkers.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 
 import os

diff --git a/sDNA_GH/custom/skel/tools/helpers/funcs.py b/sDNA_GH/custom/skel/tools/helpers/funcs.py
@@ -27,7 +27,7 @@
 # SOFTWARE.
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 import os
 import logging

diff --git a/sDNA_GH/custom/skel/tools/helpers/rhino_gh_geom.py b/sDNA_GH/custom/skel/tools/helpers/rhino_gh_geom.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 
 import os

diff --git a/sDNA_GH/custom/skel/tools/inserter.py b/sDNA_GH/custom/skel/tools/inserter.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 import logging
 import collections

diff --git a/sDNA_GH/custom/skel/tools/name_mapper.py b/sDNA_GH/custom/skel/tools/name_mapper.py
@@ -1,7 +1,7 @@
 #! /usr/bin/python
 # -*- coding: utf-8 -*-
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 import logging
 import collections

diff --git a/sDNA_GH/custom/skel/tools/runner.py b/sDNA_GH/custom/skel/tools/runner.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 
 import logging

diff --git a/sDNA_GH/custom/tools.py b/sDNA_GH/custom/tools.py
@@ -34,7 +34,7 @@
 """
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 import os
 import sys

diff --git a/sDNA_GH/dev_tools/dev_tools.py b/sDNA_GH/dev_tools/dev_tools.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 import os
 import logging

diff --git a/sDNA_GH/dev_tools/unload_sDNA_GH.py b/sDNA_GH/dev_tools/unload_sDNA_GH.py
@@ -33,7 +33,7 @@
 """
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 
 from ghpythonlib.componentbase import executingcomponent as component

diff --git a/sDNA_GH/launcher.py b/sDNA_GH/launcher.py
@@ -63,7 +63,7 @@
 """
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 
 

diff --git a/sDNA_GH/main.py b/sDNA_GH/main.py
@@ -43,7 +43,7 @@
 """
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 import sys
 import os
@@ -982,12 +982,17 @@ def update_tools(self, nick_name = None):
 
 
         for tool in my_tools:
-            self.tools_default_opts.update(tool.default_tool_opts)
+
+            if not isinstance(tool, tools.sDNA_ToolWrapper):
+                continue
+
             self.not_shared.update(tool.not_shared)
 
-            if isinstance(tool, tools.sDNA_ToolWrapper):
-                sDNA = tools.sDNA_key(self.opts)  # the submodule, tools.py
-                self.do_not_remove += tool.default_named_tuples[sDNA]._fields
+            self.tools_default_opts.update(tool.default_tool_opts)
+
+            sDNA = tools.sDNA_key(self.opts)  # the submodule, tools.py
+            self.do_not_remove += tool.default_named_tuples[sDNA]._fields
+
 
         #self.logger.debug(self.opts)
         self.logger.debug('Tool opts == ' + '\n'.join(

diff --git a/sDNA_GH/tests/test_cases.py b/sDNA_GH/tests/test_cases.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 
 import sys

diff --git a/sDNA_GH/tests/unit_tests/sDNA_GH_unit_tests.py b/sDNA_GH/tests/unit_tests/sDNA_GH_unit_tests.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 import sys
 import os

diff --git a/sDNA_GH/tests/unit_tests/skel_unit_tests.py b/sDNA_GH/tests/unit_tests/skel_unit_tests.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.7.1'
+__version__ = '2.7.2-rc'
 
 import sys
 import os
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,7 @@ @@
     """
     __author__ = 'James Parrott'
-    __version__ = '2.7.1'
+    __version__ = '2.7.2-rc'
@@ Expand Down @@