I04_1-156: merged master in this branch, so travis is setup

Author: IsabellaRey

.travis.yml

@@ -0,0 +1,43 @@
+language: python
+sudo: required
+python:
+  - "3.5"
+
+# All of the following up until pip install -r requirements.txt is to install PyQt4
+# and was taken from https://stackoverflow.com/questions/35513019/install-pyqt4-with-python3-on-travis-ci
+before_install:
+  - sudo mkdir -p /downloads
+  - sudo chmod a+rw /downloads
+  - curl -L http://sourceforge.net/projects/pyqt/files/sip/sip-4.16.9/sip-4.16.9.tar.gz -o /downloads/sip.tar.gz 
+  - curl -L http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.11.4/PyQt-x11-gpl-4.11.4.tar.gz -o /downloads/pyqt4.tar.gz
+  # Builds
+  - sudo mkdir -p /builds
+  - sudo chmod a+rw /builds
+
+install:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - sudo apt-get install -y libqt4-dev
+  - sudo apt-get install -y mesa-common-dev libgl1-mesa-dev libglu1-mesa-dev
+  # Qt4
+  - pushd /builds
+  # SIP
+  - tar xzf /downloads/sip.tar.gz --keep-newer-files
+  - pushd sip-4.16.9
+  - python configure.py
+  - make
+  - sudo make install
+  - popd
+  # PyQt4
+  - tar xzf /downloads/pyqt4.tar.gz --keep-newer-files
+  - pushd PyQt-x11-gpl-4.11.4
+  - python configure.py -c --confirm-license --no-designer-plugin -e QtCore -e QtGui -e QtTest
+  - make
+  - sudo make install
+  - popd
+  # Builds Complete
+  - popd
+  - pip install -r requirements.txt
+script:
+  - nosetests
+

docs/code.md

@@ -27,6 +27,8 @@ The following steps will help you prepare an appropriate Python environment to r
     * opencv_python-3.1.0-cp35-cp35m-win32.whl
     * scipy-0.17.1-cp35-cp35m-win32.whl
     * PyQt4-4.11.4-cp35-none-win32.whl
+
+NOTE: there is a requirements.txt file that was created for use by the CI server Travis. It works in Travis but it wasn't tested locally. It contains all of the above dependencies except for enum and PyQt4.
 
 * Download the source code for the Barcode scanner program from <https://github.com/DiamondLightSource/PuckBarcodeReader> - use the ‘Download ZIP’ link. Open the zip and extract the contents to a suitable folder.
 
@@ -52,3 +54,8 @@ For example: "C:\Users\Urszula Neuman\AppData\Local\Programs\Python\Python35\pyt
 The result exec file is created in subdirectrory called dist.
 
 NOTE: when creating the executable on a 64bit machine (using Python 3.5.1 32bit) you might get the error ‘No module named pywintypes’. To fix this, try `pip install pypiwin32`.
+
+Continuous Integration
+======================
+[Travis CI](https://travis-ci.org/) was setup as the Continuous Integration server for this repository. You should be able to login with your GitHub credentials and see the repository there. The configuration file for Travis is .travis.yml in the root directory.
+

requirements.txt

@@ -0,0 +1,6 @@
+pyperclip
+numpy
+scipy
+opencv-python
+mock
+

tests/system_tests/system_tests.py

@@ -35,13 +35,14 @@
 TEST_OUTPUT_PATH = '../test-output/'
 
 CONFIG_FILE = "../config.ini"
-OPTIONS = BarcodeConfig(CONFIG_FILE)
+# TODO: restore the four commented lines below
+# OPTIONS = BarcodeConfig(CONFIG_FILE)
 
-STORE = Store(OPTIONS.store_directory.value(), OPTIONS)
+# STORE = Store(OPTIONS.store_directory.value(), OPTIONS)
 
 # TODO: this needs an extra plate argument, or the tests have an error
-def store_scan(plate, img):
-    STORE.add_record(plate, img)
+# def store_scan(plate, img):
+#     STORE.add_record(plate, img)
 
 
 def run_tests():

tests/unit_tests/test_dls_barcode/test_data_store/test_record.py

@@ -63,15 +63,18 @@ def test_any_barcode_matches_returns_false_if_no_barcodes_passed(self):
     def test_csv_string_contains_time_in_human_readable_format(self):
         # Arrange
         timestamp = 1505913516.3836024
-        human_readable_timestamp = "2017-09-20 14:18:36"
+        # Full human readable timestamp is "2017-09-20 14:18:36" but Travis CI server runs on a different time zone so can't compare the hours
+        human_readable_timestamp_day = "2017-09-20 "
+        human_readable_timestamp_minutes = ":18:36"
         source_string = "f59c92c1;" + str(timestamp) + ";test.png;None;DLSL-010,DLSL-011,DLSL-012;1569:1106:70-2307:1073:68-1944:1071:68"
         record = Record.from_string(source_string)
 
         # Act
         csv_string = record.to_csv_string()
 
         # Assert
-        self.assertIn(human_readable_timestamp, csv_string)
+        self.assertIn(human_readable_timestamp_day, csv_string)
+        self.assertIn(human_readable_timestamp_minutes, csv_string)
         self.assertNotIn(str(timestamp), csv_string)