Skip to content

Commit

Permalink
fix types, reduce date range of test data, update terraform documenta…
Browse files Browse the repository at this point in the history
…tion
  • Loading branch information
Thomas Maschler committed Jun 6, 2020
1 parent f07bb6f commit 8d53a4a
Show file tree
Hide file tree
Showing 7 changed files with 88 additions and 90 deletions.
2 changes: 1 addition & 1 deletion app/routes/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
async def dataset_dependency(
dataset: str = Path(..., title="Dataset", regex=DATASET_REGEX)
) -> str:
if dataset == "latetst":
if dataset == "latest":
raise HTTPException(
status_code=400, detail="Name `latest` is reserved for versions only.",
)
Expand Down
4 changes: 1 addition & 3 deletions batch/python/cluster_partitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
@click.option("-v", "--version", type=str, help="Version name")
@click.option("-p", "--partition_type", type=str, help="Partition type")
@click.option("-P", "--partition_schema", type=str, help="Partition schema")
@click.option("-P", "--partition_schema", type=str, help="Partition schema")
@click.option("-P", "--partition_schema", type=str, help="Partition schema")
@click.option("-x", "--index_type", type=str, help="Index type used for clustering")
@click.option("-c", "--column_name", type=str, help="Column used for clustering")
def cli(
Expand All @@ -26,7 +24,7 @@ def cli(
) -> None:

click.echo(
f"python cluster_partition.py -d {dataset} -v {version} -p {partition_type} -P {partition_schema} -x {index_type} -c {column_name}"
f"python cluster_partitions.py -d {dataset} -v {version} -p {partition_type} -P {partition_schema} -x {index_type} -c {column_name}"
)

connection = psycopg2.connect(
Expand Down
2 changes: 1 addition & 1 deletion batch/python/create_partitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def cli(dataset: str, version: str, partition_type: str, partition_schema: str)
FROM ('{partition["start_value"]}')
TO ('{partition["end_value"]}')
"""
# click.echo(sql)
click.echo(sql)
cursor.execute(sql)
else:
NotImplementedError(
Expand Down
2 changes: 1 addition & 1 deletion batch/scripts/cluster_partitions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ ME=$(basename "$0")
# While it seems unnecessary here to pass the arguments through the get_arguments.sh script
# I prefer to still do it. This way, we have a consistent way to log the env variables and can make sure
# that argument names are used consistently across all tools.
echo "PYTHON: Create partitions"
echo "PYTHON: Cluster partitions"
cluster_partitions.py -d "$DATASET" -v "$VERSION" -p "$PARTITION_TYPE" -P "$PARTITION_SCHEMA" -x "$INDEX_TYPE" -c "$COLUMN_NAME"
6 changes: 3 additions & 3 deletions terraform.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

| Name | Version |
|------|---------|
| terraform | >=0.12.24 |
| aws | ~> 2.56.0 |
| terraform | >=0.12.26 |
| aws | ~> 2.65.0 |

## Providers

| Name | Version |
|------|---------|
| aws | ~> 2.56.0 |
| aws | ~> 2.65.0 |
| template | n/a |
| terraform | n/a |

Expand Down
160 changes: 80 additions & 80 deletions tests/fixtures/test.tsv

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/tasks/test_default_assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ async def callback(message):

# define partition schema
partition_schema = list()
years = range(2011, 2022)
years = range(2018, 2021)
for year in years:
for week in range(1, 54):
try:
Expand Down

0 comments on commit 8d53a4a

Please sign in to comment.