Commit 932c3591 authored by jay's avatar jay
Browse files

Merge remote-tracking branch 'upstream/master' into win32

parents 369d308e 7aac3c31

appveyor.yml

+20 −5
Original line number Diff line number Diff line
@@ -4,15 +4,30 @@ branches: 


version: '0.1.0.{build}'



platform:

  - x64

  - x86



environment:

  matrix:

    - PYTHON: "C:\\Miniconda35-x64\\Scripts\\activate.bat"

      PYTHON_VERSION: 3.5

    - PYTHON: "C:\\Miniconda36-x64\\Scripts\\activate.bat"

      PYTHON_VERSION: 3.6

    - PYTHON: "C:\\Miniconda35\\Scripts\\activate.bat"

      PYTHON_VERSION: 3.5

    - PYTHON: "C:\\Miniconda36\\Scripts\\activate.bat"



platform:

  - x64

matrix:

  exclude:

    - PYTHON: "C:\\Miniconda35-x64\\Scripts\\activate.bat"

      platform: x86

    - PYTHON: "C:\\Miniconda36-x64\\Scripts\\activate.bat"

      platform: x86

    - PYTHON: "C:\\Miniconda35\\Scripts\\activate.bat"

      platform: x64

    - PYTHON: "C:\\Miniconda36\\Scripts\\activate.bat"

      platform: x64



configuration:

  - Release
@@ -26,7 +41,7 @@ install: 
  - cmd: activate test_env

  - cmd: conda config --add channels conda-forge

  - cmd: conda install -c conda-forge pvl protobuf gdal numpy pandas sqlalchemy pyyaml networkx affine h5py scipy

  - cmd: conda install pytest-cov

  - cmd: conda install -c conda-forge pytest pytest-cov

  # https://pythonhosted.org/CodeChat/appveyor.yml.html

  - cmd: python -m pip install -U pip

  - cmd: python -m easy_install -U setuptools

plio/examples/SocetGXP/out_InSightE08_XW.gpf

0 → 100644
+803 −0

File added.

Preview size limit exceeded, changes collapsed.

plio/io/io_gpf.py

+49 −0

File changed.

Preview size limit exceeded, changes collapsed.

plio/io/tests/test_gpf.py→plio/io/tests/test_io_gpf.py

+13 −1

File changed and moved.

Preview size limit exceeded, changes collapsed.