Skip to content

Commit

Permalink
Merge pull request #809 from hkad98/improvements
Browse files Browse the repository at this point in the history
Minor improvements – bump dependencies
  • Loading branch information
hkad98 authored Sep 19, 2024
2 parents b9a8d8c + 9a16602 commit f6d2d7a
Show file tree
Hide file tree
Showing 28 changed files with 55 additions and 51 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,12 @@ jobs:
with:
path: dist/
- name: Create GitHub release
uses: "marvinpinto/action-[email protected]"
uses: "softprops/action-gh-release@v2"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
token: "${{ secrets.GITHUB_TOKEN }}"
draft: false
prerelease: false
make_latest: true
files: |
dist/**/*.whl
dist/**/*.tar.gz
Expand Down
8 changes: 4 additions & 4 deletions ci_tests.mk
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ endif
# Targets to build docker file for each python version
.PHONY: test-ci-py39-build
test-ci-py39-build: Dockerfile
docker build --build-arg "PY_TAG=3.9.19-slim-bullseye" --build-arg "ENV_TAG=py39" -t python-sdk:py39 .
docker build --build-arg "PY_TAG=3.9.20-slim-bookworm" --build-arg "ENV_TAG=py39" -t python-sdk:py39 .

.PHONY: test-ci-py310-build
test-ci-py310-build: Dockerfile
docker build --build-arg "PY_TAG=3.10.14-slim-bullseye" --build-arg "ENV_TAG=py310" -t python-sdk:py310 .
docker build --build-arg "PY_TAG=3.10.15-slim-bookworm" --build-arg "ENV_TAG=py310" -t python-sdk:py310 .

.PHONY: test-ci-py311-build
test-ci-py311-build: Dockerfile
docker build --build-arg "PY_TAG=3.11.9-slim-bullseye" --build-arg "ENV_TAG=py311" -t python-sdk:py311 .
docker build --build-arg "PY_TAG=3.11.10-slim-bookworm" --build-arg "ENV_TAG=py311" -t python-sdk:py311 .

.PHONY: test-ci-py312-build
test-ci-py312-build: Dockerfile
docker build --build-arg "PY_TAG=3.12.4-slim-bullseye" --build-arg "ENV_TAG=py312" -t python-sdk:py312 .
docker build --build-arg "PY_TAG=3.12.6-slim-bookworm" --build-arg "ENV_TAG=py312" -t python-sdk:py312 .

# test-ci target triggers unit tests for each requested environment
.PHONY: test-ci
Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-r ./tox-requirements.txt
-r ./release-requirements.txt
pre-commit~=3.6.0
pre-commit~=3.8.0

-r ./fmt-requirements.txt

Expand Down
2 changes: 1 addition & 1 deletion fmt-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruff==0.5.7
ruff==0.6.5
4 changes: 2 additions & 2 deletions gooddata-dbt/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pyyaml>=5.1
attrs>=21.4.0,<=23.2.0
cattrs>=22.1.0,<=23.2.3
attrs>=21.4.0,<=24.2.0
cattrs>=22.1.0,<=24.1.1
requests~=2.31.0
tabulate~=0.8.10
4 changes: 2 additions & 2 deletions gooddata-dbt/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
REQUIRES = [
"gooddata-sdk~=1.27.0",
"pyyaml>=5.1",
"attrs>=21.4.0,<=23.2.0",
"cattrs>=22.1.0,<=23.2.3",
"attrs>=21.4.0,<=24.2.0",
"cattrs>=22.1.0,<=24.1.1",
"requests~=2.31.0",
"tabulate~=0.8.10",
]
Expand Down
2 changes: 1 addition & 1 deletion gooddata-dbt/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pytest~=8.2.2
pytest~=8.3.3
pytest-cov~=5.0.0
2 changes: 1 addition & 1 deletion gooddata-dbt/tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# (C) 2023 GoodData Corporation
[tox]
envlist = py3{8,9,10,11}
envlist = py3{9,10,11,12}

[testenv]
package = wheel
Expand Down
4 changes: 2 additions & 2 deletions gooddata-dbt/type-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
mypy~=1.8.0
pydantic~=2.6.0
mypy~=1.11.2
pydantic~=2.9.2
2 changes: 1 addition & 1 deletion gooddata-fdw/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pytest~=8.2.2
pytest~=8.3.3
pytest-cov~=5.0.0
vcrpy~=6.0.1
# TODO - Bump the version together with bumping the version of openapi generator
Expand Down
2 changes: 1 addition & 1 deletion gooddata-fdw/tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# (C) 2021 GoodData Corporation
[tox]
envlist = py3{8,9,10,11}
envlist = py3{9,10,11,12}

[testenv]
package = wheel
Expand Down
4 changes: 2 additions & 2 deletions gooddata-fdw/type-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
mypy~=1.8.0
pydantic~=2.6.0
mypy~=1.11.2
pydantic~=2.9.2
2 changes: 1 addition & 1 deletion gooddata-flexfun/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pytest~=8.2.2
pytest~=8.3.3
pytest-cov~=5.0.0
2 changes: 1 addition & 1 deletion gooddata-flexfun/tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# (C) 2024 GoodData Corporation
[tox]
envlist = py3{9,10,11}
envlist = py3{9,10,11,12}

[testenv]
package = wheel
Expand Down
4 changes: 2 additions & 2 deletions gooddata-flexfun/type-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
mypy~=1.8.0
pydantic~=2.6.0
mypy~=1.11.2
pydantic~=2.9.2
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,16 @@ def _init_names(cls: Any) -> Any:


_RetryFlagsLiteral: TypeAlias = Literal["any", "other", "here"]
_FlagsMapping = {
Literal["any"]: _RETRY_ANY_FLAG,
Literal["here"]: _RETRY_HERE_FLAG,
Literal["other"]: _RETRY_OTHER_FLAG,
_FlagsMapping: dict[_RetryFlagsLiteral, int] = {
"any": _RETRY_ANY_FLAG,
"here": _RETRY_HERE_FLAG,
"other": _RETRY_OTHER_FLAG,
}


def _get_flags(retry: Optional[_RetryFlagsLiteral] = None) -> int:
if retry is None:
return 0x0
return _FlagsMapping.get(retry, 0x0)


Expand Down
2 changes: 1 addition & 1 deletion gooddata-flight-server/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pytest~=8.2.2
pytest~=8.3.3
pytest-cov~=5.0.0
2 changes: 1 addition & 1 deletion gooddata-flight-server/tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# (C) 2024 GoodData Corporation
[tox]
envlist = py3{9,10,11}
envlist = py3{9,10,11,12}

[testenv]
package = wheel
Expand Down
4 changes: 2 additions & 2 deletions gooddata-flight-server/type-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
mypy~=1.8.0
pydantic~=2.6.0
mypy~=1.11.2
pydantic~=2.9.2
2 changes: 1 addition & 1 deletion gooddata-pandas/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pytest~=8.2.2
pytest~=8.3.3
pytest-cov~=5.0.0
vcrpy~=6.0.1
# TODO - Bump the version together with bumping the version of openapi generator
Expand Down
2 changes: 1 addition & 1 deletion gooddata-pandas/tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# (C) 2021 GoodData Corporation
[tox]
envlist = py3{8,9,10,11}
envlist = py3{9,10,11,12}

[testenv]
package = wheel
Expand Down
4 changes: 2 additions & 2 deletions gooddata-pandas/type-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
mypy~=1.8.0
pydantic~=2.6.0
mypy~=1.11.2
pydantic~=2.9.2
4 changes: 2 additions & 2 deletions gooddata-sdk/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
python-dateutil >= 2.5.3
pyyaml>=5.1
attrs>=21.4.0,<=23.2.0
cattrs>=22.1.0,<=23.2.3
attrs>=21.4.0,<=24.2.0
cattrs>=22.1.0,<=24.1.1
brotli==1.1.0
requests~=2.31.0
python-dotenv>=1.0.0,<2.0.0
4 changes: 2 additions & 2 deletions gooddata-sdk/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"gooddata-api-client~=1.27.0",
"python-dateutil>=2.5.3",
"pyyaml>=5.1",
"attrs>=21.4.0,<=23.2.0",
"cattrs>=22.1.0,<=23.2.3",
"attrs>=21.4.0,<=24.2.0",
"cattrs>=22.1.0,<=24.1.1",
"brotli==1.1.0",
"requests~=2.31.0",
"python-dotenv>=1.0.0,<2.0.0",
Expand Down
8 changes: 4 additions & 4 deletions gooddata-sdk/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pytest~=8.2.2
pytest~=8.3.3
pytest-cov~=5.0.0
pytest-snapshot==0.9.0
pytest-order~=1.2.1
pytest-order~=1.3.0
vcrpy~=6.0.1
# TODO - Bump the version together with bumping the version of openapi generator
urllib3==1.26.9
python-dotenv~=1.0.0
attrs>=21.4.0,<=23.2.0
cattrs>=22.1.0,<=23.2.3
attrs>=21.4.0,<=24.2.0
cattrs>=22.1.0,<=24.1.1
2 changes: 1 addition & 1 deletion gooddata-sdk/tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# (C) 2021 GoodData Corporation
[tox]
envlist = py3{9,10,11}
envlist = py3{9,10,11,12}

[testenv]
package = wheel
Expand Down
8 changes: 4 additions & 4 deletions gooddata-sdk/type-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
mypy~=1.8.0
pydantic~=2.6.0
mypy~=1.11.2
pydantic~=2.9.2
types-python-dateutil >= 2.5.3
types-pyyaml~=6.0.0
attrs==21.4.0
cattrs==22.1.0
attrs>=21.4.0,<=24.2.0
cattrs>=22.1.0,<=24.1.1
4 changes: 2 additions & 2 deletions tox-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
tox~=4.14.1
tox-uv~=1.7.0
tox~=4.20.0
tox-uv~=1.12.0

0 comments on commit f6d2d7a

Please sign in to comment.