From abdaff50586faec6325afd3976c9ba1da447eb20 Mon Sep 17 00:00:00 2001 From: Daniel <d.hornung@indiscale.com> Date: Wed, 15 May 2024 16:28:41 +0200 Subject: [PATCH] FIX: Pipeline --- .docker/Dockerfile | 6 +++++- .gitlab-ci.yml | 3 ++- src/doc/conf.py | 6 ++++-- tox.ini | 3 +-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index a4d9ce69..166f8703 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -10,7 +10,11 @@ RUN apt-get update && \ python3-sphinx \ tox \ -y -RUN pip3 install pylint recommonmark sphinx-rtd-theme +RUN pip3 install \ + pylint \ + recommonmark \ + sphinx-rtd-theme \ + ; COPY .docker/wait-for-it.sh /wait-for-it.sh ARG PYLIB ADD https://gitlab.indiscale.com/api/v4/projects/97/repository/commits/${PYLIB} \ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff313673..6b595350 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,7 +118,8 @@ unittest_py3.9: stage: test image: $CI_REGISTRY_IMAGE script: - - tox + - python3 -c "import pyreadstat; print(pyreadstat.__version__)" + - tox unittest_py3.8: tags: [cached-dind] diff --git a/src/doc/conf.py b/src/doc/conf.py index 65feaff2..cf32b2e7 100644 --- a/src/doc/conf.py +++ b/src/doc/conf.py @@ -214,6 +214,8 @@ intersphinx_mapping = { # TODO Which options do we want? autodoc_default_options = { - 'members': None, - 'undoc-members': None, + 'members': True, + 'undoc-members': True, + 'member-order': 'bysource', + 'special-member': ["__init__"], } diff --git a/tox.ini b/tox.ini index e5877743..c8a29dc3 100644 --- a/tox.ini +++ b/tox.ini @@ -3,10 +3,9 @@ envlist = py38, py39, py310, py311, py312, py313 skip_missing_interpreters = true [testenv] -deps = . +deps = .[h5_crawler,spss] pytest pytest-cov - h5py # TODO: Make this f-branch sensitive git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev git+https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools.git@dev -- GitLab