Merge branch 'develop' into test_master_release

Subsequent changes caused problems for development, and will need to be
merged in more carefully from develop

src/clstepcore/STEPaggrEnum.h

@@ -9,7 +9,7 @@
 
 /**
  * \class EnumAggregate
- * This is a minimal representions for a collection of SDAI_Enum
+ * This is a minimal representation for a collection of SDAI_Enum
  */
 class SC_CORE_EXPORT EnumAggregate  :  public STEPaggregate {
 public:
@@ -55,7 +55,7 @@ SC_CORE_EXPORT BOOLEANS * create_BOOLEANS();
 
 /**
  * * \class EnumNode
- ** This is a minimal representions for node in lists of SDAI_Enum
+ ** This is a minimal representation for node in lists of SDAI_Enum
  */
 class SC_CORE_EXPORT EnumNode  : public STEPnode {
 public:

src/clstepcore/STEPaggrSelect.h

@@ -11,7 +11,7 @@
 
 /**
  * * \class SelectAggregate
- ** This is a minimal represention for a collection of SDAI_Select
+ ** This is a minimal representation for a collection of SDAI_Select
  */
 class SC_CORE_EXPORT SelectAggregate  :  public STEPaggregate {
 public:
@@ -35,7 +35,7 @@ typedef        SelectAggregate_ptr  SelectAggregate_var;
 
 /**
  * * \class SelectNode
- ** This is a minimal representions for node in lists of SDAI_Select
+ ** This is a minimal representation for node in lists of SDAI_Select
  */
 class SC_CORE_EXPORT SelectNode  : public STEPnode {
 public:

src/clstepcore/typeDescriptor.cc

@@ -75,7 +75,7 @@ bool TypeDescriptor::CurrName( const char * other, const char * schNm ) const {
         // other better = the alt name.
         return ( !StrCmpIns( _altname, other ) );
     } else {
-        // If we have no desginated alternate name when the current schema =
+        // If we have no designated alternate name when the current schema =
         // schNm, other must = our _name.
         return ( OurName( other ) );
     }

src/exp2python/python/LICENSE

@@ -4,7 +4,7 @@
 
 # All rights reserved.
 
-# This file is part of the StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/exp2python/python/README.md

@@ -1,21 +1,21 @@
-# SCL - A Python3 STEP Class Library
+# stepcode - A Python3 STEP Library
 
-SCL is a Python3-based library for parsing and manipulating ISO 10303 Part 21 ("STEP") files. 
+STEPCODE Python is a Python3-based library for parsing and manipulating ISO 10303 Part 21 ("STEP") files.
 
 # Use
 
-To parse a ISO 10303 Part 21 file, use the `Parser` class of `SCL.Part21`. On a successful parse, the result will be a Part 21 parse tree and associated STEP instances.
+To parse a ISO 10303 Part 21 file, use the `Parser` class of `stepcode.Part21`. On a successful parse, the result will be a Part 21 parse tree and associated STEP instances.
 
-See [test_parser](tests/test_parser.py) for use of the `SCL.Part21` parser with a sample STEP file.
+See [test_parser](tests/test_parser.py) for use of the `stepcode.Part21` parser with a sample STEP file.
 
 
 # Building
 
-The SCL Python package can be built directly using [PyPA's build module](https://github.com/pypa/build). Run `python3 -m build` from this directory.
+The stepcode Python package can be built directly using [PyPA's build module](https://github.com/pypa/build). Run `python3 -m build` from this directory.
 
 # Testing
 
-SCL comes with a small test suite (additions welcome!) From this directory, `python3 -m unittest discover`.
+STEPCODE Python comes with a small test suite (additions welcome!) From this directory, `python3 -m unittest discover`.
 
 # License
 

src/exp2python/python/setup.cfg

@@ -1,8 +1,8 @@
 [metadata]
-name = stepcode-scl
-version = 0.6.1
+name = stepcode
+version = 0.7.0
 author = Thomas Paviot <tpaviot@gmail.com>, Christopher HORLER (cshorler@googlemail.com), Devon Sparks (devonsparks.com)
-description = stepcode-scl is a Python3-based library for parsing and manipulating ISO 10303 Part 21 ("STEP") files. 
+description = stepcode is a Python3-based library for parsing and manipulating ISO 10303 Part 21 ("STEP") files.
 long_description = file: README.md
 long_description_content_type = text/markdown
 
@@ -15,7 +15,7 @@ classifiers =
 [options]
 package_dir =
     =.
-packages = SCL
+packages = stepcode
 python_requires = >=3.6
 install_requires =
     ply

src/exp2python/python/stepcode/AggregationDataTypes.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2011, Thomas Paviot (tpaviot@gmail.com)
 # All rights reserved.
 
-# This file is part of the StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/exp2python/python/stepcode/BaseType.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2011, Thomas Paviot (tpaviot@gmail.com)
 # All rights reserved.
 
-# This file is part of the StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/exp2python/python/stepcode/Builtin.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2011-2012, Thomas Paviot (tpaviot@gmail.com)
 # All rights reserved.
 
-# This file is part of the StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/exp2python/python/stepcode/ConstructedDataTypes.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2011, Thomas Paviot (tpaviot@gmail.com)
 # All rights reserved.
 
-# This file is part of the StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/exp2python/python/stepcode/Model.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2011-2012, Thomas Paviot (tpaviot@gmail.com)
 # All rights reserved.
 
-# This file is part of the StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/exp2python/python/stepcode/Part21.py

@@ -6,7 +6,7 @@
 #
 # All rights reserved.
 #
-# This file is part of the StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/exp2python/python/stepcode/Rules.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2011-2012, Thomas Paviot (tpaviot@gmail.com)
 # All rights reserved.
 
-# This file is part of the StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/exp2python/python/stepcode/SCLBase.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2022, Chris Horler (cshorler@googlemail.com)
 # All rights reserved.
 
-# This file is part of the StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/exp2python/python/stepcode/SimpleDataTypes.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2011, Thomas Paviot (tpaviot@gmail.com)
 # All rights reserved.
 
-# This file is part of the StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/exp2python/python/stepcode/TypeChecker.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2011, Thomas Paviot (tpaviot@gmail.com)
 # All rights reserved.
 
-# This file is part of the StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/exp2python/python/stepcode/Utils.py

@@ -3,7 +3,7 @@
 
 # All rights reserved.
 
-# This file is part of the StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/exp2python/python/stepcode/_cPart21.c

@@ -6,7 +6,7 @@
  *
  * All rights reserved.
  *
- * This file is part of the StepClassLibrary (SCL).
+ * This file is part of the STEPCODE project.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

src/exp2python/python/stepcode/_cPart21.l

@@ -5,7 +5,7 @@
  *
  * All rights reserved.
  *
- * This file is part of the StepClassLibrary (SCL).
+ * This file is part of the STEPCODE project.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

src/exp2python/python/stepcode/cPart21.py

@@ -5,7 +5,7 @@
 #
 # All rights reserved.
 #
-# This file is part of the StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/exp2python/python/tests/test_SCL.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2011, Thomas Paviot (tpaviot@gmail.com)
 # All rights reserved.
 
-# This file is part StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/exp2python/python/tests/test_base.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2011, Thomas Paviot (tpaviot@gmail.com)
 # All rights reserved.
 
-# This file is part StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -32,10 +32,10 @@
 import sys
 import unittest
 
-from SCL.SimpleDataTypes import *
-from SCL.TypeChecker import *
-from SCL.ConstructedDataTypes import *
-from SCL.AggregationDataTypes import *
+from stepcode.SimpleDataTypes import *
+from stepcode.TypeChecker import *
+from stepcode.ConstructedDataTypes import *
+from stepcode.AggregationDataTypes import *
 
 #
 # Simple data types

src/exp2python/python/tests/test_builtin.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2011-2012, Thomas Paviot (tpaviot@gmail.com)
 # All rights reserved.
 
-# This file is part StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -32,11 +32,11 @@
 import sys
 import unittest
 
-from SCL.SimpleDataTypes import *
-from SCL.TypeChecker import *
-from SCL.ConstructedDataTypes import *
-from SCL.AggregationDataTypes import *
-from SCL.Builtin import *
+from stepcode.SimpleDataTypes import *
+from stepcode.TypeChecker import *
+from stepcode.ConstructedDataTypes import *
+from stepcode.AggregationDataTypes import *
+from stepcode.Builtin import *
 
 float_epsilon = 1e-8
 #

src/exp2python/python/tests/test_parser.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2021, Devon Sparks (devonsparks.com)
 # All rights reserved.
 
-# This file is part StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -30,7 +30,7 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import unittest
-from SCL.Part21 import Parser
+from stepcode.Part21 import Parser
 
 ShapesSample ="""
 ISO-10303-21;

src/exp2python/python/tests/test_unitary_schemas.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2011, Thomas Paviot (tpaviot@gmail.com)
 # All rights reserved.
 
-# This file is part StepClassLibrary (SCL).
+# This file is part of the STEPCODE project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -36,11 +36,11 @@ import os
 here = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(os.path.join(here, "..", "..", "examples", "unitary_schemas"))
 
-from SCL.SCLBase import *
-from SCL.SimpleDataTypes import *
-from SCL.ConstructedDataTypes import *
-from SCL.AggregationDataTypes import *
-from SCL.TypeChecker import check_type
+from stepcode.SCLBase import *
+from stepcode.SimpleDataTypes import *
+from stepcode.ConstructedDataTypes import *
+from stepcode.AggregationDataTypes import *
+from stepcode.TypeChecker import check_type
 
 class TestSelectDataType(unittest.TestCase):
     '''