Skip to content

Commit 9d1a977

Browse files
authored
feat: Use latest Resoto and bump version (#40)
1 parent 6152ed8 commit 9d1a977

File tree

9 files changed

+21
-24
lines changed

9 files changed

+21
-24
lines changed

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: clean clean-test clean-pyc clean-build clean-env docs help setup
1+
.PHONY: clean clean-test clean-pyc clean-build clean-env docs help setup test test-all
22
.DEFAULT_GOAL := help
33
.SILENT: clean clean-build clean-pyc clean-test setup
44

@@ -77,8 +77,7 @@ venv:
7777
python3 -m venv venv --prompt "cloud2sql"
7878
. ./venv/bin/activate && python3 -m pip install --upgrade pip
7979
. ./venv/bin/activate && pip install -r requirements-test.txt
80-
. ./venv/bin/activate && pip install -r requirements.txt
81-
. ./venv/bin/activate && pip install -e .
80+
. ./venv/bin/activate && pip install -e ".[all]"
8281
. ./venv/bin/activate && mypy --install-types --non-interactive cloud2sql tests
8382

8483
setup: clean clean-env venv

cloud2sql/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
__author__ = "Some Engineering Inc."
1212
__license__ = "Apache 2.0"
1313
__copyright__ = "Copyright © 2022 Some Engineering Inc."
14-
__version__ = "0.7.2"
14+
__version__ = "0.8.0"

cloud2sql/arrow/writer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ def value_to_string(v: Any) -> str:
168168

169169

170170
def write_batch_to_file(batch: ArrowBatch) -> ArrowBatch:
171-
172171
to_normalize = collect_normalization_paths(batch.schema)
173172

174173
for row in batch.rows:

config-template.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ sources:
2525
# Account thread/process pool size
2626
account_pool_size: 8
2727
# Region thread pool size
28-
region_pool_size: 128
28+
region_pool_size: 32
2929
# Number of threads available shared for all regions
30-
shared_pool_size: 128
30+
shared_pool_size: 32
3131
# Number of threads to collect a single region
3232
region_resources_pool_size: 2
3333
# List of AWS services to collect (default: all)
@@ -97,7 +97,7 @@ sources:
9797
# Onelogin client secret
9898
client_secret: null
9999
destinations:
100-
# Define the destination to sync.
100+
# Define the destination to sync.
101101
# PostgreSQL is listed here as example - see README.md for a list of possible targets.
102102
posgresql:
103103
host: 127.0.0.1

requirements-parquet.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
pyarrow==10.0.1
1+
pyarrow==11.0.0
22
google-cloud-storage==2.7.0
3-
boto3==1.26.10
3+
boto3>=1.26.61

requirements-snowflake.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
snowflake-sqlalchemy>=1.4.4
1+
snowflake-sqlalchemy==1.4.6

requirements-test.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# test dependencies
2-
pytest==7.2.0
3-
black==22.10.0
2+
pytest==7.2.2
3+
black==23.1.0
44
flake8>=6.0.0
5-
mypy>=0.991
6-
tox>=4.0.3
5+
mypy==1.1.1
6+
tox==4.4.6
77
wheel>=0.38.4
8-
coverage>=6.5.0
9-
resoto-plugin-example-collector>=3.0.0
8+
coverage==7.2.1
9+
resoto-plugin-example-collector==3.2.5

requirements.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ PyYAML>=6.0
66
rich>=12.6.0
77
resotoclient>=1.2.1
88
posthog>=2.2.0
9-
requests>=2.28.1
9+
requests>=2.28.2
1010

11-
resotolib>=3.1.0
11+
resotolib>=3.2.5, <3.3
1212
# all collector plugins
13-
resoto-plugin-aws>=3.1.0
14-
resoto-plugin-digitalocean>=3.1.0
15-
resoto-plugin-gcp>=3.1.0
16-
resoto-plugin-k8s>=3.1.0
13+
resoto-plugin-aws>=3.2.5, <3.3
14+
resoto-plugin-digitalocean>=3.2.5, <3.3
15+
resoto-plugin-gcp>=3.2.5, <3.3
16+
resoto-plugin-k8s>=3.2.5, <3.3

tests/arrow/model_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ def test_create_schema(model: Model) -> None:
3434

3535

3636
def test_update(parquet_writer: ArrowWriter) -> None:
37-
3837
parquet_writer.insert_node( # type: ignore
3938
{
4039
"type": "node",

0 commit comments

Comments
 (0)