Merge pull request #56 from cta-sst-1m/work_on_py3.7

start using py3.7 as well
cta-observatory · Oct 10, 2018 · 416d2ca · 416d2ca
2 parents eec3d82 + 48ae44b
commit 416d2ca
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,11 @@ matrix:
       env:
         - PYTHON_VERSION=3.6
         - MINICONDA_URL=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
+    - os: linux
+      python: 3.7
+      env:
+        - PYTHON_VERSION=3.7
+        - MINICONDA_URL=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
     - os: osx
       python: 3.5
       env:

diff --git a/protozfits/__init__.py b/protozfits/__init__.py
@@ -11,7 +11,7 @@
 from . import rawzfits
 # If you would like to learn more about the contents of the compiled
 # rawzfits extension. Please have a look into protozfits/rawzfits.pyx
-from google.protobuf.pyext.cpp_message import GeneratedProtocolMessageType
+from google.protobuf.reflection import GeneratedProtocolMessageType
 from .CoreMessages_pb2 import AnyArray
 from .any_array_to_numpy import any_array_to_numpy
 

diff --git a/protozfits/rawzfits.cpython-35m-x86_64-linux-gnu.so b/protozfits/rawzfits.cpython-35m-x86_64-linux-gnu.so
diff --git a/protozfits/rawzfits.cpython-36m-x86_64-linux-gnu.so b/protozfits/rawzfits.cpython-36m-x86_64-linux-gnu.so
diff --git a/protozfits/rawzfits.cpython-37m-x86_64-linux-gnu.so b/protozfits/rawzfits.cpython-37m-x86_64-linux-gnu.so
diff --git a/protozfits/tests/test_File.py b/protozfits/tests/test_File.py
@@ -46,7 +46,7 @@ def test_File_getitem_with_iterable():
 
 def test_File_getitem_with_range():
     f = File(example_file_path)
-    interesting_event_ids = range(10, 1, -2)
+    interesting_event_ids = range(9, 1, -2)
     expected_event_numbers = [FIRST_EVENT_NUMBER + i for i in interesting_event_ids]
     for i, event in enumerate(f.Events[interesting_event_ids]):
         assert event.eventNumber == expected_event_numbers[i]