Merge pull request #16 from stactools-packages/dev

New bucket location

.pre-commit-config.yaml

@@ -22,7 +22,6 @@ repos:
       - id: mypy
         additional_dependencies:
           - click != 8.1.0
-          - stactools == 0.4.7
   - repo: https://github.com/pycqa/isort
     rev: 5.12.0
     hooks:

CHANGELOG.md

@@ -11,7 +11,7 @@ number as needed.
 
 ### Added
 
-- Nothing.
+- New bucket prefix ([#15](https://github.com/stactools-packages/amazonia-1/issues/15)).
 
 ### Deprecated
 

docker/Dockerfile

@@ -19,7 +19,7 @@ RUN apt-get -y -q update \
 RUN python -m venv /opt/venv
 RUN pip install . --no-binary rasterio \
     && ls /opt/venv \
-    && rm -r /opt/venv/lib/python3.10/site-packages/stactools/amazonia_1
+    && rm -r /opt/venv/lib/python3.11/site-packages/stactools/amazonia_1
 
 
 FROM dependencies as builder

setup.cfg

@@ -29,6 +29,7 @@ packages = find_namespace:
 install_requires =
     stactools >= 0.4.2
     utm
+    requests
 
 [options.packages.find]
 where = src

src/stactools/amazonia_1/stac.py

@@ -482,9 +482,9 @@ def create_item(asset_href: str) -> Item:
     )
 
     # Metadata bucket
-    meta_prefix = "https://s3.amazonaws.com/amazonia-meta-pds/"
+    meta_prefix = "https://brazil-eosats.s3.amazonaws.com/"
     # COG bucket
-    main_prefix = "s3://amazonia-pds/"
+    main_prefix = "s3://brazil-eosats/"
 
     # Thumbnail asset
     item.add_asset(

tests/test_commands.py

@@ -11,7 +11,7 @@
 from stactools.amazonia_1.commands import create_amazonia1_command
 
 
-class CommandsTest(CliTestCase):
+class CommandsTest(CliTestCase):  # type: ignore
     """CommandsTest."""
 
     def create_subcommand_functions(self) -> List[Callable[[Group], Command]]:

tests/test_stac.py

@@ -105,24 +105,24 @@ def test_create_item() -> None:
         in item.stac_extensions
     )
     assert (
-        "https://stac-extensions.github.io/eo/v1.0.0/schema.json"
+        "https://stac-extensions.github.io/eo/v1.1.0/schema.json"
         in item.stac_extensions
     )
 
     # assets
     assert (
         item.assets["thumbnail"].href
-        == "https://s3.amazonaws.com/amazonia-meta-pds/AMAZONIA1/WFI/036/018/"
+        == "https://brazil-eosats.s3.amazonaws.com/AMAZONIA1/WFI/036/018/"
         "AMAZONIA_1_WFI_20220811_036_018_L4/AMAZONIA_1_WFI_20220811_036_018.png"
     )
     assert (
         item.assets["metadata"].href
-        == "s3://amazonia-pds/AMAZONIA1/WFI/036/018/AMAZONIA_1_WFI_20220811_036_018_L4/"
+        == "s3://brazil-eosats/AMAZONIA1/WFI/036/018/AMAZONIA_1_WFI_20220811_036_018_L4/"
         "AMAZONIA_1_WFI_20220811_036_018_L4_BAND2.xml"
     )
     assert (
         item.assets["B2"].href
-        == "s3://amazonia-pds/AMAZONIA1/WFI/036/018/AMAZONIA_1_WFI_20220811_036_018_L4/"
+        == "s3://brazil-eosats/AMAZONIA1/WFI/036/018/AMAZONIA_1_WFI_20220811_036_018_L4/"
         "AMAZONIA_1_WFI_20220811_036_018_L4_BAND2.tif"
     )
 
@@ -153,17 +153,17 @@ def test_create_item() -> None:
     # assets
     assert (
         item.assets["thumbnail"].href
-        == "https://s3.amazonaws.com/amazonia-meta-pds/AMAZONIA1/WFI/033/018/"
+        == "https://brazil-eosats.s3.amazonaws.com/AMAZONIA1/WFI/033/018/"
         "AMAZONIA_1_WFI_20220810_033_018_L4/AMAZONIA_1_WFI_20220810_033_018.png"
     )
     assert (
         item.assets["metadata"].href
-        == "s3://amazonia-pds/AMAZONIA1/WFI/033/018/AMAZONIA_1_WFI_20220810_033_018_L4/"
+        == "s3://brazil-eosats/AMAZONIA1/WFI/033/018/AMAZONIA_1_WFI_20220810_033_018_L4/"
         "AMAZONIA_1_WFI_20220810_033_018_L4_LEFT_BAND2.xml"
     )
     assert (
         item.assets["B2"].href
-        == "s3://amazonia-pds/AMAZONIA1/WFI/033/018/AMAZONIA_1_WFI_20220810_033_018_L4/"
+        == "s3://brazil-eosats/AMAZONIA1/WFI/033/018/AMAZONIA_1_WFI_20220810_033_018_L4/"
         "AMAZONIA_1_WFI_20220810_033_018_L4_LEFT_BAND2.tif"
     )