Skip to content

Bump version for typeguard and pyspark #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Bump version for typeguard and pyspark #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1d1c77a
Bump version for typeguard and pyspark
patrykgromek Oct 6, 2021
fe42d37
Change pyspark version in requirements.txt
patrykgromek Oct 6, 2021
4cca69d
Change pip snapshot repo
patrykgromek Oct 14, 2021
2228e37
Twine upload without ssl check
patrykgromek Oct 27, 2021
636fc18
Temp commmit
patrykgromek Oct 27, 2021
eeb03ba
Temp commmit2
patrykgromek Nov 9, 2021
8500193
Doc-build set pysequila version manually
patrykgromek Nov 9, 2021
241c318
Change pip_snapshot_repo to bdg-pip
patrykgromek Nov 9, 2021
d0f1c52
Doc-build set use bdg-pip/simple
patrykgromek Nov 17, 2021
0f65e02
Explicitly set pyspark sequila version
patrykgromek Nov 17, 2021
9b72042
Allow error in nbsphinx
patrykgromek Nov 18, 2021
cb5bc0f
use wget no-check-certificate
patrykgromek Nov 18, 2021
3210971
Remove nbsphinx_allow_errors
patrykgromek Nov 18, 2021
92c8b45
use wget no-check-certificate
patrykgromek Nov 18, 2021
4589d9f
notebooks sub-repository indicator
patrykgromek Nov 20, 2021
6123b62
Merge remote-tracking branch 'origin/feature/upgrade_dependencies_ver…
patrykgromek Nov 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Author

@patrykgromek patrykgromek Nov 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ominięcie starego certyfikatu

tags: [ docker ]


Expand Down Expand Up @@ -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"
Copy link
Author

@patrykgromek patrykgromek Nov 18, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tutaj chyba będę musiał wrócić do $VERSION ? jednak bez podania wersji bezpośrednio build PR się wywalał

script:
- cd docs && ./docs.sh html
artifacts:
Expand Down
3 changes: 2 additions & 1 deletion build_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
fi

1 change: 0 additions & 1 deletion docs/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,5 @@
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']


# -- Extension configuration -------------------------------------------------

2 changes: 1 addition & 1 deletion docs/source/notebooks
Open in desktop
Submodule notebooks updated from cbc4ab to 48934c
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pyspark==3.0.1
pyspark==3.1.2
findspark
setuptools
wheel
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down