From 94e55538c5ff8e8e70ffd38b8011f471ec870d1c Mon Sep 17 00:00:00 2001 From: Vincent Sarago Date: Wed, 22 Jul 2020 23:58:05 -0400 Subject: [PATCH] add boto3 in the requirements (#202) --- CHANGES.txt | 4 ++++ requirements.txt | 10 +++++----- setup.py | 20 +++++++------------- tests/test_reader.py | 6 ------ 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index e858290c..a3312a40 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +2.0b2 (2020-07-23) +------------------ +- add boto3 in the dependency (#201) + 2.0b1 (2020-07-22) ------------------ - switch to ContextManager for COG and STAC (rio_cogeo.io.COGReader, rio_cogeo.io.STACReader). diff --git a/requirements.txt b/requirements.txt index b9c0a907..a097940c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ +boto3 + +dataclasses>=0.6;python_version<'3.7' -numpy numexpr +numpy mercantile - -rasterio[s3]>=1.1.3 - -dataclasses>=0.6;python_version<'3.7' +rasterio>=1.1.3 requests diff --git a/setup.py b/setup.py index 1191b7f5..fafd427a 100644 --- a/setup.py +++ b/setup.py @@ -7,29 +7,23 @@ # Runtime requirements. inst_reqs = [ - "numpy", + "boto3", + "dataclasses>=0.6;python_version<'3.7'", "numexpr", + "numpy", "mercantile", - "rasterio[s3]>=1.1.3", - "dataclasses>=0.6;python_version<'3.7'", + "rasterio>=1.1.3", "requests", ] extra_reqs = { - "test": ["mock", "pytest", "pytest-benchmark", "pytest-cov", "rio-cogeo"], - "dev": [ - "mock", - "pytest", - "pytest-benchmark", - "pytest-cov", - "rio-cogeo", - "pre-commit", - ], + "test": ["pytest", "pytest-benchmark", "pytest-cov", "rio-cogeo"], + "dev": ["pytest", "pytest-benchmark", "pytest-cov", "rio-cogeo", "pre-commit"], } setup( name="rio-tiler", - version="2.0b1", + version="2.0b2", python_requires=">=3", description=u"""Rasterio plugin to read mercator tiles from Cloud Optimized GeoTIFF.""", long_description=readme, diff --git a/tests/test_reader.py b/tests/test_reader.py index c2d288b8..eba1033e 100644 --- a/tests/test_reader.py +++ b/tests/test_reader.py @@ -10,12 +10,6 @@ from rio_tiler import constants, reader from rio_tiler.errors import AlphaBandWarning, TileOutsideBounds -LANDSAT_SCENE_C1 = "LC08_L1TP_016037_20170813_20170814_01_RT" -LANDSAT_BUCKET = os.path.join(os.path.dirname(__file__), "fixtures", "landsat-pds") -LANDSAT_PATH = os.path.join( - LANDSAT_BUCKET, "c1", "L8", "016", "037", LANDSAT_SCENE_C1, LANDSAT_SCENE_C1 -) - S3_KEY = "hro_sources/colorado/201404_13SED190110_201404_0x1500m_CL_1.tif" S3_KEY_ALPHA = "hro_sources/colorado/201404_13SED190110_201404_0x1500m_CL_1_alpha.tif" S3_KEY_NODATA = "hro_sources/colorado/201404_13SED190110_201404_0x1500m_CL_1_nodata.tif"