Skip to content

Commit

Permalink
Try removing pointCollection and icepyx from dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
benhills committed Oct 24, 2020
1 parent 54a9e36 commit 824ec1d
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 7 deletions.
5 changes: 4 additions & 1 deletion IS2_velocity/extract_alongtrack.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ):
Expand Down
10 changes: 8 additions & 2 deletions IS2_velocity/plotting.py
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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')
plt.close('all')
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ matplotlib
scipy
h5py
astropy
icepyx
pointCollection
pyproj
pandas
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
'scipy',
'h5py',
'astropy',
'icepyx',
'pointCollection @ git+https://github.com/smithB/pointCollection.git#egg=pointCollection-1.0.0.0'
'pyproj',
'pandas'
#'icepyx',
#'pointCollection @ git+https://github.com/smithB/pointCollection.git#egg=pointCollection-1.0.0.0'
]
)

0 comments on commit 824ec1d

Please sign in to comment.