From 3be56679f2a394f6f39f190475a5f074ca3936cf Mon Sep 17 00:00:00 2001
From: David Manthey <david.manthey@kitware.com>
Date: Thu, 12 Apr 2018 11:54:10 -0400
Subject: [PATCH] Fix argparse pinning.

argparse was pinned to version 1.3 for python < 3.  argparse version
1.2.1 is built in to Python 2.7.  Version 1.3 adds alias support, which
is not used by gaia.  The pinned version doesn't install in a Python 2.7
virtualenv, resulting in the inability to import Gaia.

I've changed this so only Python 2.6 will import argparse.  Perhaps we
should remove support for Python 2.6, in which case we could remove
argparse as a requirement, since it is built in to Python 2.7 and
>=3.2.
---
 .travis.yml      | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f050919..0c97eec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ before_install:
   - chmod +x miniconda.sh
   - ./miniconda.sh -b -p $HOME/miniconda
   - export PATH=$HOME/miniconda/bin:$PATH
-  - conda update --yes conda python
+  # - conda update --yes conda python
   # create environment in conda
   - conda env create -f conda_env.yml python=$TRAVIS_PYTHON_VERSION
   - conda install -c conda-forge -y geos=3.6.2
diff --git a/requirements.txt b/requirements.txt
index addffe8..3d063a3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,7 +15,7 @@ pip>=6.0
 numpy>=1.10.0
 six>=1.11.0
 requests>=2.7.0
-argparse>=1.3.0; python_version < '3.0'
+argparse>=1.3.0; python_version < '2.7'
 shapely>=1.5.0
 geopandas>=0.1.0
 pillow>=3.1.1