chore: adapt uv in infra

hkad98 · hkad98 · commit c7267f2518d1 · 2025-10-22T15:58:15.000+02:00
It is necessary to adapt uv in the code and infra things.
diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
@@ -44,13 +44,18 @@ jobs:
         pip install build
     - name: Build ${{ matrix.component }}
       run: |
-          cd ${{ matrix.component }}
+          if [ "${{ matrix.component }}" = "gooddata-api-client" ]; then
+            cd ${{ matrix.component }}
+          else
+            cd packages/${{ matrix.component }}
+          fi
           python -m build
     - name: Persist ${{ matrix.component }} artifacts
       uses: actions/upload-artifact@v4
       with:
         name: artifacts_${{ matrix.component }}
-        path: ${{ matrix.component }}/dist/
+        path: |
+          ${{ matrix.component == 'gooddata-api-client' && format('{0}/dist/', matrix.component) || format('packages/{0}/dist/', matrix.component) }}
         if-no-files-found: error
   github_release:
     name: Create GitHub release
diff --git a/.github/workflows/dev-release.yaml b/.github/workflows/dev-release.yaml
@@ -40,12 +40,16 @@ jobs:
         run: pip install build
       - name: Build ${{ matrix.component }}
         run: |
-          cd ${{ matrix.component }}
+          if [ "${{ matrix.component }}" = "gooddata-api-client" ]; then
+            cd ${{ matrix.component }}
+          else
+            cd packages/${{ matrix.component }}
+          fi
           python -m build
       - name: Push ${{ matrix.component}} to pypi
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: ${{ matrix.component }}/dist
+          packages_dir: ${{ matrix.component == 'gooddata-api-client' && format('{0}/dist', matrix.component) || format('packages/{0}/dist', matrix.component) }}
           verbose: true
diff --git a/.github/workflows/rw-collect-changes.yaml b/.github/workflows/rw-collect-changes.yaml
@@ -34,18 +34,11 @@ jobs:
           base: ${{ inputs.commit-branch }}
           filters: |
             docs:
-              - 'gooddata-pandas/**'
-              - 'gooddata-sdk/**'
+              - 'packages/gooddata-pandas/**'
+              - 'packages/gooddata-sdk/**'
               - 'docs/**'
             python-modules:
               - '.docker/**'
-              - 'gooddata-fdw/**'
-              - 'gooddata-pandas/**'
-              - 'gooddata-sdk/**'
+              - 'packages/**'
               - '*.mk'
               - 'Makefile'
-              - 'gooddata-api-client/**'
-              - 'gooddata-dbt/**'
-              - 'gooddata-flight-server/**'
-              - 'gooddata-flexconnect/**'
-              - 'gooddata-pipelines/**'
diff --git a/.github/workflows/rw-python-tests.yaml b/.github/workflows/rw-python-tests.yaml
@@ -24,23 +24,21 @@ jobs:
         if: ${{ matrix.python_version == 'py313' }}
         uses: codecov/codecov-action@v3
         with:
-          files: ./gooddata-sdk/coverage.xml,./gooddata-pandas/coverage.xml,./gooddata-fdw/coverage.xml,./gooddata-flight-server/coverage.xml,./gooddata-flexconnect/coverage.xml
+          files: ./packages/gooddata-sdk/coverage.xml,./packages/gooddata-pandas/coverage.xml,./packages/gooddata-fdw/coverage.xml,./packages/gooddata-flight-server/coverage.xml,./packages/gooddata-flexconnect/coverage.xml
   lint-and-format-check:
     runs-on: ubuntu-latest
     if: ${{inputs.changed-python-modules == 'true'}}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Set up python 3.13
-        uses: actions/setup-python@v5
+        uses: astral-sh/setup-uv@v6
         with:
-          python-version-file: '.python-version'
-          cache: 'pip'
-          cache-dependency-path: |
-            fmt-requirements.txt
+          python-version: 3.13
       - name: Install dependencies
         run: |
-          make dev
+          uv venv
+          uv pip install --group lint
       - name: pep8 and formatting check
         run: |
           make format
@@ -54,13 +52,10 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version-file: '.python-version'
-          cache: 'pip'
-          cache-dependency-path: |
-            tox-requirements.txt
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install -r tox-requirements.txt
+          python -m pip install uv
+          uv pip install --group tox --group type --system
       - name: mypy check
         run: |
           make mypy
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -143,12 +143,12 @@ Here are the options how to run the tests:
 - run tests for one sub-project - drill down to sub-project's directory
     - use `make test` to trigger tests
   ```bash
-  cd gooddata-sdk
+  cd packages/gooddata-sdk
   make test
   ```
     - or execute `tox` command with arguments of your choice
   ```bash
-  cd gooddata-sdk
+  cd packages/gooddata-sdk
   tox -e py39
   ```
 - run tests for all non-client projects using `make test` in project root directory
@@ -210,7 +210,7 @@ venv automatically. So when docker tox tests are executed after localhost tests
   ```
 - run all tests for all supported python environments and for one project
   ```bash
-  cd gooddata-sdk
+  cd packages/gooddata-sdk
   make test-ci
   ```
 - run all tests containing `http_headers` in name for py310 and py39 for all projects
diff --git a/Dockerfile b/Dockerfile
@@ -30,7 +30,7 @@ RUN set -x \
 ENV PYTHON_TOX_VERSION=4.14.1
 ENV PYTHON_TOX_UV_VERSION=1.7.0
 RUN set -x \
-  && pip3 install tox==${PYTHON_TOX_VERSION} tox-uv==${PYTHON_TOX_UV_VERSION}\
+  && pip3 install uv tox==${PYTHON_TOX_VERSION} tox-uv==${PYTHON_TOX_UV_VERSION}\
   && true
 
 COPY .docker/entrypoint.sh /entrypoint.sh
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # (C) 2021 GoodData Corporation
 # list all full paths to files and directories in CWD containing "gooddata", filter out ones ending by "client"
-NO_CLIENT_GD_PROJECTS_ABS = $(filter-out %client, $(wildcard $(CURDIR)/*gooddata*))
+NO_CLIENT_GD_PROJECTS_ABS = $(filter-out %client, $(wildcard $(CURDIR)/packages/*gooddata*))
 # for each path, take only the base name of the path
 NO_CLIENT_GD_PROJECTS_DIRS = $(foreach dir, $(NO_CLIENT_GD_PROJECTS_ABS), $(notdir $(dir)))
 # TODO: replace API_VERSION in the future by call to API
@@ -18,9 +18,7 @@ all:
 
 .PHONY: dev
 dev:
-	rm -rf .venv
-	python3.13 -m venv .venv --upgrade-deps
-	.venv/bin/pip3 install -r dev-requirements.txt
+	uv sync --all-groups
 	.venv/bin/pre-commit install
 
 .PHONY: lint
@@ -72,13 +70,13 @@ download:
 .PHONY: mypy
 mypy:
 	RESULT=0; \
-	for project in $(NO_CLIENT_GD_PROJECTS_DIRS); do $(MAKE) -C $${project} $@ || RESULT=$$?; done; \
+	for project in $(NO_CLIENT_GD_PROJECTS_DIRS); do $(MAKE) -C packages/$${project} $@ || RESULT=$$?; done; \
 	exit $$RESULT
 
 .PHONY: test
 test:
 	RESULT=0; \
-	for project in $(NO_CLIENT_GD_PROJECTS_DIRS); do $(MAKE) -C $${project} test || RESULT=$$?; done; \
+	for project in $(NO_CLIENT_GD_PROJECTS_DIRS); do $(MAKE) -C packages/$${project} test || RESULT=$$?; done; \
 	exit $$RESULT
 
 .PHONY: release
@@ -98,13 +96,13 @@ check-copyright:
 .PHONY: docs
 docs:
 	RESULT=0; \
-	for project in gooddata-fdw gooddata-pandas; do $(MAKE) -C $${project} $@ || RESULT=$$?; done; \
+	for project in gooddata-fdw gooddata-pandas; do $(MAKE) -C packages/$${project} $@ || RESULT=$$?; done; \
 	exit $$RESULT
 
 .PHONY: remove-cassettes
 remove-cassettes:
 	RESULT=0; \
-	for project in $(NO_CLIENT_GD_PROJECTS_DIRS); do $(MAKE) -C $${project} $@ || RESULT=$$?; done; \
+	for project in $(NO_CLIENT_GD_PROJECTS_DIRS); do $(MAKE) -C packages/$${project} $@ || RESULT=$$?; done; \
 	exit $$RESULT
 
 .PHONY: new-docs
diff --git a/README.md b/README.md
@@ -16,26 +16,26 @@ Python. Learn more about the clients in their [dedicated readme](./clients_READM
 
 ### GoodData Python SDK
 
-The [gooddata-sdk](./gooddata-sdk) package provides a clean and convenient Python API to interact with GoodData.CN.
+The [gooddata-sdk](./packages/gooddata-sdk) package provides a clean and convenient Python API to interact with GoodData.CN.
 
 Check out the GoodData Python SDK [documentation](https://www.gooddata.com/docs/python-sdk) to learn more and get started.
 
 ### GoodData Pandas
 
-The [gooddata-pandas](./gooddata-pandas) package is a thin layer that utilizes Python SDK and allows you to conveniently
+The [gooddata-pandas](./packages/gooddata-pandas) package is a thin layer that utilizes Python SDK and allows you to conveniently
 create pandas series and data frames.
 
 Check out the GoodData Pandas [documentation](https://gooddata-pandas.readthedocs.io/en/latest/) to learn more and get started.
 
 ### GoodData Pipelines
 
-The [gooddata-pipelines](./gooddata-pipelines/) package provides easy ways to manage the lifecycle of GoodData Cloud.
+The [gooddata-pipelines](./packages/gooddata-pipelines/) package provides easy ways to manage the lifecycle of GoodData Cloud.
 
 Check out the GoodData Pipelines [documentation](https://www.gooddata.com/docs/python-sdk/latest/pipelines-overview/) to learn more and get started.
 
 ### GoodData FlexConnect
 
-The [gooddata-flexconnect](./gooddata-flexconnect) package is the foundation for writing custom FlexConnect data sources.
+The [gooddata-flexconnect](./packages/gooddata-flexconnect) package is the foundation for writing custom FlexConnect data sources.
 
 Check out the GoodData FlexConnect [documentation](https://www.gooddata.com/docs/cloud/connect-data/create-data-sources/flexconnect/) to learn more and get started.
 
@@ -44,7 +44,7 @@ Check out the GoodData FlexConnect [documentation](https://www.gooddata.com/docs
 > [!WARNING]
 > GoodData Foreign Data Wrapper is currently deprecated.
 
-The [gooddata-fdw](./gooddata-fdw) package provides a way
+The [gooddata-fdw](./packages/gooddata-fdw) package provides a way
 to map GoodData Cloud semantic layer and/or visualizations stored in your GoodData Cloud
 into PostgreSQL as foreign tables that you can then query using SQL.
 
diff --git a/ci_tests.mk b/ci_tests.mk
@@ -30,7 +30,7 @@ endif
 # to the project directory so that only tests for given project are executed
 DOCKER_COMMAND =
 ifdef TEST_CI_PROJECT
-	DOCKER_COMMAND = make -C $(TEST_CI_PROJECT) test
+	DOCKER_COMMAND = make -C packages/$(TEST_CI_PROJECT) test
 endif
 
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -30,7 +30,7 @@ services:
   gooddata-fdw:
     build:
       context: .
-      dockerfile: gooddata-fdw/Dockerfile
+      dockerfile: packages/gooddata-fdw/Dockerfile
     ports:
       - "2543:5432"
     environment:
@@ -42,7 +42,7 @@ services:
   upload-layout:
     build:
       context: .
-      dockerfile: tests-support/Dockerfile
+      dockerfile: packages/tests-support/Dockerfile
     environment:
       FIXTURES_DIR: /app/fixtures
       HOST: "http://gooddata-cn-ce:3000"
diff --git a/docs/Dockerfile b/docs/Dockerfile
@@ -6,8 +6,8 @@ COPY scripts/script-requirements.txt /scripts/script-requirements.txt
 COPY docs docs
 COPY scripts/docs/ /docs
 COPY gooddata-api-client /gooddata-api-client
-COPY gooddata-sdk /gooddata-sdk
-COPY gooddata-pandas /gooddata-pandas
+COPY packages/gooddata-sdk /gooddata-sdk
+COPY packages/gooddata-pandas /gooddata-pandas
 
 RUN pip install --no-cache-dir -r /scripts/script-requirements.txt
 
diff --git a/packages/gooddata-fdw/Dockerfile b/packages/gooddata-fdw/Dockerfile
@@ -28,14 +28,14 @@ RUN apk add --no-cache --update wget make musl-dev llvm llvm-dev gcc clang pytho
 # Add all required gooddata-python packages into the image
 #
 ADD gooddata-api-client /gd/gooddata-api-client
-ADD gooddata-sdk /gd/gooddata-sdk
-ADD gooddata-fdw /gd/gooddata-fdw
+ADD packages/gooddata-sdk /gd/gooddata-sdk
+ADD packages/gooddata-fdw /gd/gooddata-fdw
 
 RUN cd /gd/gooddata-api-client  && pip install . \
      && cd /gd/gooddata-sdk && pip install . \
      && cd /gd/gooddata-fdw && pip install .
 
 # Add sql files to be executed during start of container
 # They register extensions and install helping sql procedures
-ADD gooddata-fdw/sql/create_extensions.sql /docker-entrypoint-initdb.d/create_extensions.sql
-ADD gooddata-fdw/sql/import_gooddata.sql /docker-entrypoint-initdb.d/import_gooddata.sql
+ADD packages/gooddata-fdw/sql/create_extensions.sql /docker-entrypoint-initdb.d/create_extensions.sql
+ADD packages/gooddata-fdw/sql/import_gooddata.sql /docker-entrypoint-initdb.d/import_gooddata.sql
diff --git a/packages/tests-support/Dockerfile b/packages/tests-support/Dockerfile
@@ -12,14 +12,14 @@ RUN set -x \
 
 USER ${USER_NAME}
 WORKDIR /app
-COPY ./tests-support/requirements.txt /app/requirements.txt
-COPY ./tests-support/fixtures /app/fixtures
+COPY ./packages/tests-support/requirements.txt /app/requirements.txt
+COPY ./packages/tests-support/fixtures /app/fixtures
 
 RUN set -x \
   && pip3 install --no-cache-dir --user -r requirements.txt \
   && true
 
-COPY ./tests-support/*.py /app
+COPY ./packages/tests-support/*.py /app
 
 LABEL image_name="GoodData Python SDK python test support image"
 # LABEL maintainer="TigerTeam <tiger@gooddata.com>"
diff --git a/project_common.mk b/project_common.mk
@@ -15,8 +15,8 @@ ifdef ADD_ARGS
 endif
 
 
-# linting and formatting tools have configuration in parent dir to support pre-commit - use it
-# ruff use parent directory to have the same per-file-ignores config parameter for parent and child dirs
+# linting and formatting tools have configuration in root dir to support pre-commit - use it
+# ruff uses root directory to have the same per-file-ignores config parameter for all packages
 CURR_DIR_BASE_NAME = $(notdir $(CURDIR))
 
 .PHONY: all
@@ -25,28 +25,28 @@ all:
 
 .PHONY: format
 format:
-	(cd ..; .venv/bin/ruff format --check $(CURR_DIR_BASE_NAME))
+	(cd ../..; .venv/bin/ruff format --check packages/$(CURR_DIR_BASE_NAME))
 
 .PHONY: format-diff
 format-diff:
-	(cd ..; .venv/bin/ruff format --diff $(CURR_DIR_BASE_NAME))
+	(cd ../..; .venv/bin/ruff format --diff packages/$(CURR_DIR_BASE_NAME))
 
 .PHONY: format-fix
 format-fix:
-	(cd ..; .venv/bin/ruff format $(CURR_DIR_BASE_NAME))
-	(cd ..; .venv/bin/ruff check --fix $(CURR_DIR_BASE_NAME))
+	(cd ../..; .venv/bin/ruff format packages/$(CURR_DIR_BASE_NAME))
+	(cd ../..; .venv/bin/ruff check --fix packages/$(CURR_DIR_BASE_NAME))
 
 .PHONY: mypy
 mypy:
 	tox $(TOX_FLAGS) -e mypy
 
 .PHONY: test
 test:
-	tox $(TOX_FLAGS) $(LOCAL_TEST_ENVS) $(LOCAL_ADD_ARGS)
+	tox -v $(TOX_FLAGS) $(LOCAL_TEST_ENVS) $(LOCAL_ADD_ARGS)
 
 .PHONY: test-ci
 test-ci:
-	TEST_CI_PROJECT=$(CURR_DIR_BASE_NAME) $(MAKE) -C .. -f ci_tests.mk test-ci
+	TEST_CI_PROJECT=$(CURR_DIR_BASE_NAME) $(MAKE) -C ../.. -f ci_tests.mk test-ci
 
 
 # this is effective for gooddata-sdk only now - it should be part of test fixtures
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/scripts/script-requirements.txt b/scripts/script-requirements.txt
diff --git a/uv.lock b/uv.lock
