Skip to content

Commit ad96058

Browse files
committed
Updates for the 2.0.0 release. Changed from date based versioning to the more standard major.minor.micro versioning. Moved license information from the README to its own LICENSE file.
1 parent 1399afa commit ad96058

File tree

5 files changed

+32
-30
lines changed

5 files changed

+32
-30
lines changed

ChangeLog.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ Version History
254254
endian.
255255
- Fixed many Pyflakes warnings such as unused variables and unused imports.
256256
- Removed use of "import *" from most modules.
257-
- Next Release
257+
- 2.0.0 January 23, 2019
258258
- Moved the ctypes import after socket to prevent an "Aborted (core dump)"
259259
exit error on Cygwin.
260260
- _makeDeviceFromHandle function now gets/sets the U3's bootloaderVersion.
@@ -265,8 +265,8 @@ Version History
265265
"CSPINNum" has been renamed to "CSPinNum" to be consistent with the other
266266
keyword arguments. The old "CSPINNum" will still work but is deprecated
267267
and will be removed in a future version.
268-
- Removed the u3SampleAndLogToCloudDot.py example. The CloudDot service
269-
this example uses is no longer available.
268+
- Removed the u3SampleAndLogToCloudDot.py example. The CloudDot service this
269+
example uses is no longer available.
270270
- Updated the U6 streamConfig docstring.
271271
- Fixed a bug in the U6 processStreamData method where high-resolution
272272
calibration constants were being used on a U6-Pro by mistake when
@@ -309,7 +309,8 @@ Version History
309309
- Fixed the U12 aiBurst method so that the returned voltages list is
310310
correct.
311311
- Added device access/claim error detection to Exodriver open.
312-
- Updated versioning for PEP compliancy using this format: 1.<YEAR><MONTH>
313312
- Added exceptions to spi, async and i2c methods when send/receive bytes
314313
are more than the U3, U6 and UE9 supports.
315314
- Fixed spi methods for U6 and UE9 for Python 3.
315+
- Updated version to 2.0.0 for PEP compliancy and a more standardized
316+
semantic than the previous data based versioning.

LICENSE

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright (c) 2011 LabJack Corporation <support@labjack.com>
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in
11+
all copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
THE SOFTWARE.

README

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
LabJackPython: Cross-platform (Windows, Linux, Mac OS X) Python modules and
22
examples for the LabJack U3, U6, UE9 and U12.
3-
12/20/2018
3+
01/23/2019
44
support@labjack.com
55

6-
LabJackPython requires Python 2.6 or higher. Modules have been updated for
7-
Python 3.x but not all functionality has been tested yet. Functionality used in
8-
examples are tested. Please report bugs to support@labjack.com or on GitHub:
6+
LabJackPython requires Python 2.6, 2.7 or 3.x. For Python 3.x, most
7+
functionality has been tested but not all yet. Please report bugs to
8+
support@labjack.com or on GitHub:
99

1010
https://github.com/labjack/LabJackPython
1111

@@ -81,23 +81,4 @@ the LabJackPython page on LabJack's website:
8181
LICENSE
8282

8383
All LabJackPython library and example source code are licensed under MIT X11.
84-
85-
Copyright (c) 2011 LabJack Corporation <support@labjack.com>
86-
87-
Permission is hereby granted, free of charge, to any person obtaining a copy
88-
of this software and associated documentation files (the "Software"), to deal
89-
in the Software without restriction, including without limitation the rights
90-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
91-
copies of the Software, and to permit persons to whom the Software is
92-
furnished to do so, subject to the following conditions:
93-
94-
The above copyright notice and this permission notice shall be included in
95-
all copies or substantial portions of the Software.
96-
97-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
98-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
99-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
100-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
101-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
102-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
103-
THE SOFTWARE.
84+
The license can be found in the LICENSE file.

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@
2828
'Programming Language :: Python :: 3.4',
2929
'Programming Language :: Python :: 3.5',
3030
'Programming Language :: Python :: 3.6',
31+
'Programming Language :: Python :: 3.7',
3132
'Topic :: Software Development',
3233
'Topic :: Software Development :: Embedded Systems',
3334
'Topic :: System :: Hardware'
3435
]
3536

3637
setup(name='LabJackPython',
37-
version='1.201812',
38+
version='2.0.0',
3839
description='The LabJack Python modules for the LabJack U3, U6, UE9 and U12.',
3940
license='MIT X11',
4041
url='https://labjack.com/support/software/examples/ud/labjackpython',

src/LabJackPython.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import Modbus
2626

2727

28-
LABJACKPYTHON_VERSION = "1.201812"
28+
LABJACKPYTHON_VERSION = "2.0.0"
2929
__version__ = LABJACKPYTHON_VERSION
3030

3131
SOCKET_TIMEOUT = 3

0 commit comments

Comments
 (0)