Merge pull request #292 from hkad98/PSDK-154

RELATED: PSDK-154 bump dependencies

Reviewed-by: Jan Soubusta
             https://github.com/jaceksan

.github/workflows/tests.yaml

@@ -62,8 +62,7 @@ jobs:
             fmt-requirements.txt
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install -r lint-requirements.txt -r fmt-requirements.txt
+          make dev
       - name: Pep8 check
         run: |
           make lint

.pre-commit-config.yaml

@@ -7,21 +7,19 @@
 exclude: (gooddata-api-client|.*\.snapshot\..*|.openapi-generator/custom_templates)
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-added-large-files
         args: [ '--maxkb=600' ]
       - id: check-case-conflict
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.220
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.0.278
     hooks:
       - id: ruff
-        # Respect `exclude` and `extend-exclude` settings.
-        args: [ "--force-exclude" ]
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 23.7.0
     hooks:
       - id: black
   - repo: https://github.com/PyCQA/isort

Makefile

@@ -20,22 +20,22 @@ dev:
 
 .PHONY: lint
 lint:
-	ruff .
+	.venv/bin/ruff .
 
 .PHONY: format
 format:
-	black --check .
-	isort --check .
+	.venv/bin/black --check .
+	.venv/bin/isort --check .
 
 .PHONY: format-diff
 format-diff:
-	black --diff .
-	isort --diff .
+	.venv/bin/black --diff .
+	.venv/bin/isort --diff .
 
 .PHONY: format-fix
 format-fix:
-	black .
-	isort .
+	.venv/bin/black .
+	.venv/bin/isort .
 
 
 define download_client

dev-requirements.txt

@@ -1,6 +1,6 @@
 -r ./tox-requirements.txt
-tbump~=6.9.0
-pre-commit~=2.14.0
+tbump~=6.10.0
+pre-commit~=3.3.3
 
 -r ./fmt-requirements.txt
 -r ./lint-requirements.txt

fmt-requirements.txt

@@ -1,2 +1,2 @@
-black==22.3.0
-isort==5.10.1
+black==23.7.0
+isort==5.12.0

gooddata-fdw/test-requirements.txt

@@ -1,6 +1,6 @@
-pytest~=7.1.2
-pytest-cov~=3.0.0
-vcrpy~=4.2.0
+pytest~=7.4.0
+pytest-cov~=4.1.0
+vcrpy~=5.0.0
 # TODO - Bump the version together with bumping the version of openapi generator
 urllib3==1.26.9
 pyyaml

gooddata-pandas/gooddata_pandas/data_access.py

@@ -232,7 +232,6 @@ def _extract_from_attributes_and_maybe_metrics(
     col_to_metric_idx: dict[str, int],
     index_to_attr_idx: Optional[dict[str, int]] = None,
 ) -> tuple[dict, dict]:
-
     exec_def = response.exec_def
     offset = [0 for _ in exec_def.dimensions]
     limit = [len(exec_def.metrics), _RESULT_PAGE_LEN] if exec_def.has_metrics() else [_RESULT_PAGE_LEN]

gooddata-pandas/test-requirements.txt

@@ -1,7 +1,7 @@
-pytest~=7.1.2
-pytest-cov~=3.0.0
-vcrpy~=4.2.0
+pytest~=7.4.0
+pytest-cov~=4.1.0
+vcrpy~=5.0.0
 # TODO - Bump the version together with bumping the version of openapi generator
 urllib3==1.26.9
-python-dotenv~=0.20.0
+python-dotenv~=1.0.0
 pyyaml

gooddata-sdk/gooddata_sdk/catalog/user/service.py

@@ -16,7 +16,6 @@
 
 
 class CatalogUserService(CatalogServiceBase):
-
     # Entity methods for users
 
     def create_or_update_user(self, user: CatalogUser) -> None:

gooddata-sdk/test-requirements.txt

@@ -1,10 +1,10 @@
-pytest~=7.1.2
-pytest-cov~=3.0.0
+pytest~=7.4.0
+pytest-cov~=4.1.0
 pytest-snapshot==0.9.0
-pytest-order~=1.0.1
-vcrpy~=4.2.0
+pytest-order~=1.1.0
+vcrpy~=5.0.0
 # TODO - Bump the version together with bumping the version of openapi generator
 urllib3==1.26.9
-python-dotenv~=0.20.0
+python-dotenv~=1.0.0
 attrs==21.4.0
 cattrs==22.1.0

lint-requirements.txt

@@ -1 +1 @@
-ruff==0.0.220
+ruff==0.0.278

project_common.mk

@@ -25,22 +25,22 @@ all:
 
 .PHONY: lint
 lint:
-	(cd ..; ruff $(CURR_DIR_BASE_NAME))
+	(cd ..; .venv/bin/ruff $(CURR_DIR_BASE_NAME))
 
 .PHONY: format
 format:
-	(cd ..; black --check $(CURR_DIR_BASE_NAME))
-	(cd ..; isort --check $(CURR_DIR_BASE_NAME))
+	(cd ..; .venv/bin/black --check $(CURR_DIR_BASE_NAME))
+	(cd ..; .venv/bin/isort --check $(CURR_DIR_BASE_NAME))
 
 .PHONY: format-diff
 format-diff:
-	(cd ..; black --diff $(CURR_DIR_BASE_NAME))
-	(cd ..; isort --diff $(CURR_DIR_BASE_NAME))
+	(cd ..; .venv/bin/black --diff $(CURR_DIR_BASE_NAME))
+	(cd ..; .venv/bin/isort --diff $(CURR_DIR_BASE_NAME))
 
 .PHONY: format-fix
 format-fix:
-	(cd ..; black $(CURR_DIR_BASE_NAME))
-	(cd ..; isort $(CURR_DIR_BASE_NAME))
+	(cd ..; .venv/bin/black $(CURR_DIR_BASE_NAME))
+	(cd ..; .venv/bin/isort $(CURR_DIR_BASE_NAME))
 
 .PHONY: mypy
 mypy:

tests-support/upload_demo_layout.py

@@ -88,7 +88,6 @@ def create_entity(entity_id, entity_data, entity_type, api_path, action):
 
 
 def update_layout():
-
     user_groups = read_data_from_file(fixtures_dir / "user_groups.json")
     user_auth = read_data_from_file(fixtures_dir / "user_auth.json")
     user = read_data_from_file(fixtures_dir / "user.json")

tox-requirements.txt

@@ -1 +1 @@
-tox~=3.24.0
+tox~=4.6.4