Skip to content

Commit

Permalink
Fix argparse pinning.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
manthey committed Apr 12, 2018
1 parent 3d47198 commit 3be5667
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Expand Up @@ -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
Expand Down

0 comments on commit 3be5667

Please sign in to comment.