diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9129f46..4c0cd00 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -135,7 +135,7 @@ build-python37: - source $VERSION_FILE - pip install -U -r requirements.txt script: - - twine upload --repository=$PYPI_REPO dist/* --config-file=/root/pypi/.pypirc + - export CURL_CA_BUNDLE="" && twine upload --repository=$PYPI_REPO dist/* --config-file=/root/pypi/.pypirc tags: [ docker ] @@ -172,8 +172,8 @@ doc-build: - source /opt/conda/etc/profile.d/conda.sh - conda activate /tmp/jovyan/venv/$VENV_NAME/ - source "/tmp/jovyan/.sdkman/bin/sdkman-init.sh" - - pip install -U sphinx==$SPHINX_VERSION nbsphinx sphinx_rtd_theme rst2pdf sphinxcontrib-github_ribbon "sphinxcontrib-bibtex<2.0.0" pysequila==$VERSION --extra-index-url=$PIP_SNAPSHOT_REPO - - export PYSPARK_SUBMIT_ARGS="--packages org.biodatageeks:sequila_${SCALA_VERSION}:${SEQUILA_VERSION} --driver-memory 4g pyspark-shell" + - pip install -U sphinx==$SPHINX_VERSION nbsphinx sphinx_rtd_theme rst2pdf sphinxcontrib-github_ribbon "sphinxcontrib-bibtex<2.0.0" pysequila==0.2.1+geeb03ba.snapshot --extra-index-url=$PIP_SNAPSHOT_REPO + - export PYSPARK_SUBMIT_ARGS="--packages org.biodatageeks:sequila_${SCALA_VERSION}:0.2.1+geeb03ba.snapshot --driver-memory 4g pyspark-shell" script: - cd docs && ./docs.sh html artifacts: diff --git a/build_image.sh b/build_image.sh index f5c50e5..a8724be 100755 --- a/build_image.sh +++ b/build_image.sh @@ -14,4 +14,5 @@ else docker build --no-cache -t biodatageeks/$CI_PROJECT_NAME-$CONTAINER_SUFIX . if [ $(docker ps | grep $CI_PROJECT_NAME-$CONTAINER_SUFIX | wc -l) -gt 0 ]; then docker stop $CI_PROJECT_NAME-$CONTAINER_SUFIX && docker rm $CI_PROJECT_NAME-$CONTAINER_SUFIX; fi docker run --restart unless-stopped -d -p ${DOC_PORT_PREFIX}$PORT_PROD:80 --name $CI_PROJECT_NAME-$CONTAINER_SUFIX biodatageeks/$CI_PROJECT_NAME-$CONTAINER_SUFIX -fi \ No newline at end of file +fi + diff --git a/docs/source/conf.py b/docs/source/conf.py index 2bf001c..3ef1755 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,6 +69,5 @@ # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] - # -- Extension configuration ------------------------------------------------- diff --git a/docs/source/notebooks b/docs/source/notebooks index cbc4ab2..48934cd 160000 --- a/docs/source/notebooks +++ b/docs/source/notebooks @@ -1 +1 @@ -Subproject commit cbc4ab2342a6e42a55b7a631530d46d0b7c20611 +Subproject commit 48934cd7a23dfb126703fe6e32361804699d3fe0 diff --git a/requirements.txt b/requirements.txt index f8241b2..205ef23 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -pyspark==3.0.1 +pyspark==3.1.2 findspark setuptools wheel diff --git a/setup.py b/setup.py index 190f3d0..aa63cc5 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ def read_content(filepath): read_content("README.rst") + read_content(os.path.join("docs/source", "CHANGELOG.rst"))) -requires = ['setuptools', 'typeguard==2.5.0', 'pyspark==3.0.1', 'findspark'] +requires = ['setuptools', 'typeguard==2.9.1', 'pyspark==3.1.2', 'findspark'] extras_require = { 'reST': ['Sphinx'],