Skip to content

Commit 6fe8307

Browse files
committed
template
1 parent 7e756e4 commit 6fe8307

File tree

7 files changed

+25
-16
lines changed

7 files changed

+25
-16
lines changed

.travis.yml

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,41 @@
1-
language: generic
1+
language: python
2+
3+
python:
4+
- 3.5
5+
- 3.6
6+
7+
os:
8+
- linux
29

310
notifications:
411
email: false
512

613
git:
714
depth: 3
815

9-
matrix:
10-
include:
11-
# - os: osx
12-
# env: pyv=3.6
1316

14-
- os: linux
15-
env: pyv=3.6
17+
18+
19+
1620

1721
before_install:
1822
- if [[ $TRAVIS_OS_NAME == osx ]]; then
1923
wget http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh;
20-
else
24+
else
2125
wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
2226
fi
2327

24-
install:
28+
install:
2529
- bash miniconda.sh -b -p $HOME/miniconda
2630
- export PATH=$HOME/miniconda/bin:$PATH
2731
- hash -r
28-
32+
2933
- conda config --set always_yes yes --set changeps1 no
3034
- conda update -q conda
31-
- conda create -n test python=$pyv
35+
- conda create -n test python=$TRAVIS_PYTHON_VERSION
3236
- source activate test
3337
- pip -q install coveralls
34-
35-
- conda install astropy numpy pytz
38+
3639
- python setup.py develop
3740

3841
script: coverage run tests/test.py -v

angle_distance.py

100644100755
File mode changed.
File renamed without changes.
File renamed without changes.

setup.py

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
#!/usr/bin/env python
2-
from setuptools import setup
3-
42
req = ['python-dateutil','pytz','nose','numpy','astropy']
3+
# %%
4+
import pip
5+
try:
6+
import conda.cli
7+
conda.cli.main('install',*req)
8+
except Exception as e:
9+
pip.main(['install',*req])
10+
# %%
11+
from setuptools import setup
512

613
setup(name='pymap3d',
714
packages=['pymap3d'],
@@ -14,7 +21,6 @@
1421
'Development Status :: 5 - Production/Stable',
1522
'License :: OSI Approved :: BSD License',
1623
'Topic :: Scientific/Engineering :: GIS',
17-
'Programming Language :: Python :: 3.4',
1824
'Programming Language :: Python :: 3.5',
1925
'Programming Language :: Python :: 3.6',
2026
],

vdist renamed to vdist.py

File renamed without changes.

vreckon renamed to vreckon.py

File renamed without changes.

0 commit comments

Comments
 (0)