diff --git a/.github/workflows/python-request.yml b/.github/workflows/python-request.yml index 716b657f..168af14d 100644 --- a/.github/workflows/python-request.yml +++ b/.github/workflows/python-request.yml @@ -47,17 +47,23 @@ jobs: - name: Install dependencies for MacOS if: matrix.os == 'macos-latest' run: | - brew install proj + brew install proj@7 brew install geos brew install gdal brew install hdf5 brew install netcdf brew install octave + brew install pkg-config pip install --upgrade pip + pip install cython pip install numpy pip install zarr pip install pandas pip install scikit-learn + export LDFLAGS="-L/usr/local/opt/proj@7/lib" + export CPPFLAGS="-I/usr/local/opt/proj@7/include" + export ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/proj@7/lib/pkgconfig" pip install --no-deps git+https://github.com/tsutterley/read-ICESat-2.git pip install --no-deps git+https://github.com/tsutterley/read-ATM1b-QFIT-binary.git pip install . diff --git a/requirements.txt b/requirements.txt index 1e35814e..80ef190f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ scipy pyproj python-dateutil matplotlib -cartopy +cartopy --no-binary=cartopy netCDF4 h5py gdal diff --git a/setup.py b/setup.py index 4ee6212e..ee5e95b0 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ else: # get install requirements with open('requirements.txt') as fh: - install_requires = fh.read().splitlines() + install_requires = [line.split().pop(0) for line in fh.read().splitlines()] # dependency links (data readers) dependency_links = ['https://github.com/tsutterley/read-ICESat-2/tarball/main', 'https://github.com/tsutterley/read-ATM1b-QFIT-binary/tarball/main']