Skip to content

Commit

Permalink
Merge pull request #940 from gooddata/snapshot-master-5cbf4886-to-rel…
Browse files Browse the repository at this point in the history
…/dev

[bot] Merge master/5cbf4886 into rel/dev
  • Loading branch information
yenkins-admin authored Jan 6, 2025
2 parents 0a1b1fa + 5cbf488 commit 771f0a0
Show file tree
Hide file tree
Showing 17 changed files with 22 additions and 74 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
exclude: (gooddata-api-client|.*\.snapshot\..*|.openapi-generator/custom_templates)
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-added-large-files
args: [ '--maxkb=890' ]
- id: check-case-conflict
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.3.5
rev: v0.8.6
hooks:
# Run the linter.
- id: ruff
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.8.0
pre-commit~=4.0.1

-r ./fmt-requirements.txt

Expand Down
34 changes: 4 additions & 30 deletions docs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,41 +1,15 @@
FROM python:3.13-slim AS python-stage

COPY . data

WORKDIR data

RUN pip install --no-cache-dir -r scripts/script-requirements.txt

WORKDIR docs

RUN python3 ../scripts/docs/json_builder.py && \
mkdir versioned_docs/latest && \
mv -f data.json versioned_docs/latest && \
python3 ../scripts/docs/python_ref_builder.py api_spec.toml versioned_docs/latest/data.json latest versioned_docs

FROM node:20.18.0-bookworm-slim

COPY docs docs

COPY --from=python-stage data/docs/versioned_docs/latest/api-reference docs/content/en/latest/api-reference
COPY --from=python-stage data/docs/versioned_docs/latest/pandas docs/content/en/latest/pandas


RUN apt-get update && \
apt-get install -y git make golang-go curl && \
npm install -g hugo-extended@0.117.0 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
mkdir -p docs/versioned_docs/latest

COPY --from=python-stage data/docs/versioned_docs/latest/links.json docs/versioned_docs/latest
COPY --from=python-stage data/docs/versioned_docs/latest/data.json docs/versioned_docs/latest
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

COPY docs/content/en/latest/ docs/versioned_docs/latest/
COPY docs docs

WORKDIR docs
RUN npm install && \
rm -rf node_modules
RUN npm install

# accessible on http://localhost:1313/latest/
ENTRYPOINT ["hugo", "server", "-e", "dev", "--bind", "0.0.0.0"]
ENTRYPOINT ["hugo", "server", "--bind", "0.0.0.0"]
10 changes: 0 additions & 10 deletions docs/config/dev/config.toml

This file was deleted.

16 changes: 0 additions & 16 deletions docs/config/dev/params.toml

This file was deleted.

2 changes: 1 addition & 1 deletion fmt-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruff==0.6.5
ruff==0.8.6
2 changes: 1 addition & 1 deletion gooddata-dbt/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pyyaml>=5.1
pyyaml>=6.0
attrs>=21.4.0,<=24.2.0
cattrs>=22.1.0,<=24.1.1
requests~=2.32.0
Expand Down
2 changes: 1 addition & 1 deletion gooddata-dbt/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

REQUIRES = [
"gooddata-sdk~=1.33.0",
"pyyaml>=5.1",
"pyyaml>=6.0",
"attrs>=21.4.0,<=24.2.0",
"cattrs>=22.1.0,<=24.1.1",
"requests~=2.32.0",
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.3.3
pytest-cov~=5.0.0
pytest-cov~=6.0.0
4 changes: 2 additions & 2 deletions gooddata-fdw/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pytest~=8.3.3
pytest-cov~=5.0.0
vcrpy~=6.0.1
pytest-cov~=6.0.0
vcrpy~=7.0.0
# TODO - Bump the version together with bumping the version of openapi generator
urllib3==1.26.9
pyyaml
2 changes: 1 addition & 1 deletion gooddata-flexconnect/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
jsonschema~=4.23.0
pytest~=8.3.3
pytest-cov~=5.0.0
pytest-cov~=6.0.0
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.3.3
pytest-cov~=5.0.0
pytest-cov~=6.0.0
4 changes: 2 additions & 2 deletions gooddata-pandas/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pytest~=8.3.3
pytest-cov~=5.0.0
vcrpy~=6.0.1
pytest-cov~=6.0.0
vcrpy~=7.0.0
# TODO - Bump the version together with bumping the version of openapi generator
urllib3==1.26.9
python-dotenv~=1.0.0
Expand Down
2 changes: 1 addition & 1 deletion gooddata-sdk/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
python-dateutil >= 2.5.3
pyyaml>=5.1
pyyaml>=6.0
attrs>=21.4.0,<=24.2.0
cattrs>=22.1.0,<=24.1.1
brotli==1.1.0
Expand Down
2 changes: 1 addition & 1 deletion gooddata-sdk/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
REQUIRES = [
"gooddata-api-client~=1.33.0",
"python-dateutil>=2.5.3",
"pyyaml>=5.1",
"pyyaml>=6.0",
"attrs>=21.4.0,<=24.2.0",
"cattrs>=22.1.0,<=24.1.1",
"brotli==1.1.0",
Expand Down
4 changes: 2 additions & 2 deletions gooddata-sdk/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pytest~=8.3.3
pytest-cov~=5.0.0
pytest-cov~=6.0.0
pytest-snapshot==0.9.0
pytest-order~=1.3.0
vcrpy~=6.0.1
vcrpy~=7.0.0
# TODO - Bump the version together with bumping the version of openapi generator
urllib3==1.26.9
python-dotenv~=1.0.0
Expand Down
2 changes: 1 addition & 1 deletion tests-support/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from setuptools import find_packages, setup

REQUIRES = [
"pyyaml>=5.1",
"pyyaml>=6.0",
]

setup(
Expand Down

0 comments on commit 771f0a0

Please sign in to comment.