Updating to version 2.0.0.

chargeITmobility · Feb 11, 2018 · f7c02e1 · f7c02e1
1 parent 0db84b7
commit f7c02e1
Show file tree

Hide file tree

Showing 24 changed files with 32 additions and 29 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -58,3 +58,7 @@ Version 1.0.8 20 Jul 2016
 - Corrected units for model 121 WGra to be per second rather per minute to be consistent with previous correction to IEC 61850-7-420.
 - Updated models 801-809
 
+Version 2.0.0 11 Feb 2018
+-------------------------
+- Updated to support Python 3. Updated version officially supports 2.7, 3.3-3.6.
+- Include latest SMDX model definitions.
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,5 @@
 
-Copyright (C) 2017 SunSpec Alliance
+Copyright (C) 2018 SunSpec Alliance
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ interaction with SunSpec compliant devices and documents.  It can be run in
 most environments that support Python and is tested on Wndows 7, MAC OS X, and
 Ubuntu.
 
-Copyright (c) 2017 SunSpec Alliance
+Copyright (c) 2018 SunSpec Alliance
 ([License](https://github.com/sunspec/pysunspec/blob/master/LICENSE))
 
 
@@ -18,7 +18,7 @@ Copyright (c) 2017 SunSpec Alliance
 
 
 # Requirements
-- Python 2.4 - 2.7 (2.7 recommended for most uses)
+- Python 2.7, 3.3-3.6
 - pySerial
 
 
@@ -50,8 +50,7 @@ Type "help", "copyright", "credits" or "license" for more information.
 ```
 
 If Python did not show up you can acquire it from the Python Software
-Foundation's [download page](http://www.python.org/download). Keep in mind this
-repository currently uses Python 2.7 and not any Python 3.X. Accept all the
+Foundation's [download page](http://www.python.org/download). Accept all the
 default settings during the installation.
 
 > ### If using Windows and just downloaded Python you need to set environment variables

diff --git a/doc/pysunspec.rst b/doc/pysunspec.rst
@@ -5,7 +5,7 @@
 The pySunSpec package provides objects and applications that support interaction with SunSpec compliant devices and documents.
 It can be run in most environments that support Python and is tested on Wndows 7, MAC OS X, and Ubuntu.
 
-Copyright (c) 2017 SunSpec Alliance
+Copyright (c) 2018 SunSpec Alliance
 
 
 Features
@@ -18,7 +18,7 @@ Features
 
 Requirements
 ============
-- Python 2.4 - 2.7 (2.7 recommended for most uses)
+- Python 2.7, 3.3-3.6
 - pySerial
 
 

diff --git a/scripts/suns.py b/scripts/suns.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 """
-  Copyright (c) 2017, SunSpec Alliance
+  Copyright (c) 2018, SunSpec Alliance
   All Rights Reserved
 
 """

diff --git a/setup.py b/setup.py
@@ -1,17 +1,17 @@
 #!/usr/bin/env python
 
 """
-  Copyright (c) 2017, SunSpec Alliance
+  Copyright (c) 2018, SunSpec Alliance
   All Rights Reserved
 
 """
 from distutils.core import setup
 
 setup(name = 'pysunspec',
-      version = '1.0.8',
+      version = '2.0.0',
       description = 'Python SunSpec Tools',
       author = ['Bob Fox'],
-      author_email = ['bob[email protected]'],
+      author_email = ['bob@sunspec.org'],
       packages = ['sunspec', 'sunspec.core', 'sunspec.core.modbus', 'sunspec.core.test', 'sunspec.core.test.fake'],
       package_data = {'sunspec': ['models/smdx/*'], 'sunspec.core.test': ['devices/*']},
       scripts = ['scripts/suns.py']

diff --git a/sunspec/__init__.py b/sunspec/__init__.py
@@ -1,5 +1,5 @@
 
 # pysunspec version
-version = '1.0.8'
+version = '2.0.0'
 
 
diff --git a/sunspec/core/client.py b/sunspec/core/client.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/data.py b/sunspec/core/data.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/device.py b/sunspec/core/device.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/modbus/client.py b/sunspec/core/modbus/client.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/modbus/mbmap.py b/sunspec/core/modbus/mbmap.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/pics.py b/sunspec/core/pics.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/smdx.py b/sunspec/core/smdx.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/suns.py b/sunspec/core/suns.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/test/fake/serial.py b/sunspec/core/test/fake/serial.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/test/fake/socket.py b/sunspec/core/test/fake/socket.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/test/test_all.py b/sunspec/core/test/test_all.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2016 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/test/test_client.py b/sunspec/core/test/test_client.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/test/test_data.py b/sunspec/core/test/test_data.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/test/test_device.py b/sunspec/core/test/test_device.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/test/test_modbus_client.py b/sunspec/core/test/test_modbus_client.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/test/test_modbus_mbmap.py b/sunspec/core/test/test_modbus_mbmap.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),

diff --git a/sunspec/core/util.py b/sunspec/core/util.py
@@ -1,6 +1,6 @@
 
 """
-    Copyright (C) 2017 SunSpec Alliance
+    Copyright (C) 2018 SunSpec Alliance
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the "Software"),