From 682fd343611c4b5f60611d519c2233f4d4164af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
Date: Sun, 11 Feb 2018 15:54:28 +0000
Subject: construct: the construct API is significantly unstable, fix to 2.8.22
 only.

This still is required to fix Issue #38, but luckily it's just a test
failure for now.
---
 setup.py                      | 14 +++++++-------
 test-requirements.txt         |  2 +-
 test/test_construct_extras.py |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/setup.py b/setup.py
index 046a422..c9236fd 100644
--- a/setup.py
+++ b/setup.py
@@ -49,15 +49,15 @@ setup(
         # These are all the drivers' dependencies. Optional dependencies are
         # listed as mandatory for the feature.
         'otultra2': ['pyserial'],
-        'otultraeasy': ['construct>=2.8,<2.9', 'pyserial'],
-        'otverio2015': ['construct>=2.8,<2.9', 'python-scsi'],
-        'otverioiq': ['construct>=2.8,<2.9', 'pyserial'],
-        'fsinsulinx': ['construct>=2.8,<2.9', 'hidapi'],
-        'fslibre': ['construct>=2.8,<2.9', 'hidapi'],
+        'otultraeasy': ['construct==2.8.22', 'pyserial'],
+        'otverio2015': ['construct==2.8.22', 'python-scsi'],
+        'otverioiq': ['construct==2.8.22', 'pyserial'],
+        'fsinsulinx': ['construct==2.8.22', 'hidapi'],
+        'fslibre': ['construct==2.8.22', 'hidapi'],
         'fsoptium': ['pyserial'],
-        'fsprecisionneo': ['construct>=2.8,<2.9', 'hidapi'],
+        'fsprecisionneo': ['construct==2.8.22', 'hidapi'],
         'accucheck_reports': [],
-        'sdcodefree': ['construct>=2.8,<2.9', 'pyserial'],
+        'sdcodefree': ['construct==2.8.22', 'pyserial'],
     },
     entry_points = {
         'console_scripts': [
diff --git a/test-requirements.txt b/test-requirements.txt
index b1dd11d..b0ee2ff 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,5 @@
 absl-py
-construct>=2.8,<2.9
+construct==2.8.22
 pytest
 pytest-timeout
 pyserial
diff --git a/test/test_construct_extras.py b/test/test_construct_extras.py
index 66da5b7..b0cd1c3 100644
--- a/test/test_construct_extras.py
+++ b/test/test_construct_extras.py
@@ -51,7 +51,7 @@ class TestTimestamp(unittest.TestCase):
             _TEST_DATE2)
 
     def test_build_custom_epoch_negative_failure(self):
-        with self.assertRaises(construct.core.FieldError):
+        with self.assertRaises(construct.core.FormatFieldError):
             construct_extras.Timestamp(
                 construct.Int32ul, epoch=_NEW_EPOCH).build(_TEST_DATE1)
 
-- 
cgit v1.2.3