From 20bc46bcdd06b59b40460144b58ed7c02d205b9b Mon Sep 17 00:00:00 2001
From: Benjamin Hills <bhills@uw.edu>
Date: Sat, 24 Oct 2020 13:09:48 -0600
Subject: [PATCH] Try removing pointCollection and icepyx from dependencies

---
 IS2_velocity/extract_alongtrack.py |  5 ++++-
 IS2_velocity/plotting.py           | 10 ++++++++--
 requirements.txt                   |  3 +--
 setup.py                           |  5 +++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/IS2_velocity/extract_alongtrack.py b/IS2_velocity/extract_alongtrack.py
index c584917..dcc1811 100644
--- a/IS2_velocity/extract_alongtrack.py
+++ b/IS2_velocity/extract_alongtrack.py
@@ -2,7 +2,10 @@
 # -*- coding: utf-8 -*-
 
 import numpy as np
-import pointCollection as pc
+try:
+    import pointCollection as pc
+except:
+    print('Continuing withough pointCollection')
 import os, pyproj
 
 def add_surface_velocity_to_is2_dict(is2_dict, spatial_extent, path, vel_x, vel_y ):
diff --git a/IS2_velocity/plotting.py b/IS2_velocity/plotting.py
index e589618..cf28839 100644
--- a/IS2_velocity/plotting.py
+++ b/IS2_velocity/plotting.py
@@ -1,6 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 import glob, pyproj, os, h5py
 import numpy as np
-import pointCollection as pc
+try:
+    import pointCollection as pc
+except:
+    print('Continuing without pointCollection.')
 import matplotlib.pyplot as plt
 
 def plot_measures_along_track_comparison(rgt, beams, out_path, correlation_threshold, spatial_extent, plot_out_location, map_data_root,
@@ -85,4 +91,4 @@ def plot_measures_along_track_comparison(rgt, beams, out_path, correlation_thres
             2) + '.png'
         plt.savefig(outfile, dpi=200)
         if close == True:
-            plt.close('all')
\ No newline at end of file
+            plt.close('all')
diff --git a/requirements.txt b/requirements.txt
index 149fb95..99cc416 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,5 +3,4 @@ matplotlib
 scipy
 h5py
 astropy
-icepyx
-pointCollection
+pyproj
diff --git a/setup.py b/setup.py
index 0848336..d973cae 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,8 @@
         'scipy',
         'h5py',
         'astropy',
-        'icepyx',
-        'pointCollection @ git+https://github.com/smithB/pointCollection.git#egg=pointCollection-1.0.0.0'
+        'pyproj'
+        #'icepyx',
+        #'pointCollection @ git+https://github.com/smithB/pointCollection.git#egg=pointCollection-1.0.0.0'
     ]
 )