clean up dependencies

Author: phobson

.travis.yml

@@ -19,7 +19,7 @@ before_install:
   - conda install nomkl
 
 install:
-  - conda create --channel=conda-forge --name testenv --yes python=$TRAVIS_PYTHON_VERSION pandas engarde
+  - conda create --channel=conda-forge --name testenv --yes python=$TRAVIS_PYTHON_VERSION pandas
   - source activate testenv
   - conda install --channel=conda-forge --yes pytest coverage pytest-mpl pytest-cov pytest-pep8
   - pip install git+https://github.com/tomp/python-metar.git

README.rst

@@ -44,7 +44,6 @@ Dependencies
 ------------
 * Python 3.5 or greater
 * recent versions of pandas, matplotlib
-* requests for hitting the NOAA web API
 * python-metar to actually parse the metar codes
 * Jupyter for running notebook-based examples (optional)
 * pytest for testing (optional)

cloudside/asos.py

@@ -6,7 +6,6 @@
 
 import numpy
 import pandas
-import engarde.checks as ec
 
 from . station import MetarParser
 from . import validate
@@ -200,7 +199,7 @@ def parse_file(filepath, new_precipcol='precipitation'):
 
     rt = _find_reset_time(data['raw_precipitation'])
     precip = _process_precip(data, rt, 'raw_precipitation')
-    return data.assign(**{new_precipcol: precip}).pipe(ec.unique_index)
+    return data.assign(**{new_precipcol: precip})
 
 
 def get_data(station_id, startdate, stopdate, email, folder='.',
@@ -247,4 +246,5 @@ def get_data(station_id, startdate, stopdate, email, folder='.',
                              raw_folder=_raw_folder, pbar_fxn=pbar_fxn,
                              force_download=force_download)
     raw_files = validate.progress_bar(pbar_fxn, _raw_files, desc='Parsing')
-    return pandas.concat([parse_file(rf) for rf in raw_files]).pipe(ec.unique_index)
+    df = pandas.concat([parse_file(rf) for rf in raw_files])
+    return df.pipe(validate.unique_index)

cloudside/tests/test_asos.py

@@ -105,7 +105,7 @@ def test_parse_file():
 
 
 @mock.patch('ftplib.FTP')
-@mock.patch('engarde.checks.unique_index')
+@mock.patch('cloudside.validate.unique_index')
 @mock.patch('cloudside.asos._fetch_file')
 @mock.patch('cloudside.asos.parse_file', return_value=pandas.Series([1, 2, 3]))
 def test_get_data(parser, fetcher, checker, ftp):

cloudside/tests/test_validate.py

@@ -64,3 +64,13 @@ def test_step(step, error):
 def test_file_status(filename, expected):
     fn = getTestFile(filename)
     validate.file_status(fn) == expected
+
+
+@pytest.mark.parametrize(('index', 'error'), [
+    (list('ABCD'), None),
+    (list('AABC'), ValueError)
+])
+def unique_index(index, error):
+    x = pandas.Series(range(4), index=index)
+    with raises(error):
+        pdtest.assert_series_equal(x, validate.unique_index(x))

cloudside/validate.py

@@ -60,3 +60,10 @@ def progress_bar(pbar_fxn, sequence, **kwargs):
     else:
         pbar = pbar_fxn(sequence, **kwargs)
     return pbar
+
+
+def unique_index(df):
+    if df.index.is_unique:
+        return df
+    else:
+        raise ValueError('index is not unique')

conda.recipe/dev/meta.yaml

@@ -20,15 +20,12 @@ requirements:
     - metar
     - matplotlib
     - pandas
-    - requests
-
 
   run:
     - python
     - metar
     - matplotlib
     - pandas
-    - requests
 
 test:
   imports:

conda.recipe/stable/meta.yaml

@@ -21,15 +21,12 @@ requirements:
     - metar
     - matplotlib
     - pandas
-    - requests
-
 
   run:
     - python
     - metar
     - matplotlib
     - pandas
-    - requests
 
 test:
   imports:

requirements.txt

@@ -1,5 +1,4 @@
 numpy
 matplotlib
 pandas
-engarde
 metar >= 1.5

setup.py

@@ -23,7 +23,7 @@
         download_url="http://sourceforge.net/project/platformdownload.php?group_id=134052",
         license="BSD 3-Clause",
         packages=find_packages(exclude=[]),
-        platforms="Python 3.4 and later.",
+        platforms="Python 3.6 and later.",
         classifiers=[
             "Development Status :: 3 - Alpha",
             "Environment :: Console",