diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 489e9d05c..933c6a230 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -10,11 +10,15 @@ tag_name = version/{new_version} [bumpversion:part:release] optional_value = stable first_value = beta -values = +values = alpha beta stable +[bumpversion:file:client-packages/allauth/setup.py] + +[bumpversion:file:client-packages/sentry-auth-passbook/setup.py] + [bumpversion:file:helm/passbook/values.yaml] [bumpversion:file:helm/passbook/Chart.yaml] diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bbf89fc00..dc1eb159a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,98 +1,124 @@ # Global Variables before_script: - - "python3 -m pip install -U virtualenv" - - "virtualenv env" - - "source env/bin/activate" - - "pip3 install -U -r requirements-dev.txt" + - "python3 -m pip install -U virtualenv" + - "virtualenv env" + - "source env/bin/activate" + - "pip3 install -U -r requirements-dev.txt" stages: - - test - - build - - docs - - deploy + - test + - build + - docs + - deploy image: python:3.6 services: - - postgres:latest + - postgres:latest variables: - POSTGRES_DB: passbook - POSTGRES_USER: passbook - POSTGRES_PASSWORD: 'EK-5jnKfjrGRm<77' + POSTGRES_DB: passbook + POSTGRES_USER: passbook + POSTGRES_PASSWORD: "EK-5jnKfjrGRm<77" include: - - /client-packages/allauth/.gitlab-ci.yml + - /client-packages/allauth/.gitlab-ci.yml isort: - script: - - isort -c -sg env - stage: test + script: + - isort -c -sg env + stage: test migrations: - script: - - python manage.py migrate - stage: test + script: + - python manage.py migrate + stage: test prospector: - script: - - prospector - stage: test + script: + - prospector + stage: test pylint: - script: - - pylint passbook - stage: test + script: + - pylint passbook + stage: test coverage: - script: - - coverage run manage.py test - - coverage report - stage: test + script: + - coverage run manage.py test + - coverage report + stage: test bandit: - script: - - bandit -r passbook - stage: test + script: + - bandit -r passbook + stage: test package-docker: - image: - name: gcr.io/kaniko-project/executor:debug - entrypoint: [""] - before_script: - - echo "{\"auths\":{\"docker.$NEXUS_URL\":{\"auth\":\"$NEXUS_AUTH\"}}}" > /kaniko/.docker/config.json - script: - - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination docker.pkg.beryju.org/passbook:latest --destination docker.pkg.beryju.org/passbook:0.1.17-beta - stage: build - only: - - tags - - /^version/.*$/ + image: + name: gcr.io/kaniko-project/executor:debug + entrypoint: [""] + before_script: + - echo "{\"auths\":{\"docker.$NEXUS_URL\":{\"auth\":\"$NEXUS_AUTH\"}}}" > /kaniko/.docker/config.json + script: + - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination docker.pkg.beryju.org/passbook:latest --destination docker.pkg.beryju.org/passbook:0.1.17-beta + stage: build + only: + - tags + - /^version/.*$/ package-helm: - stage: build - script: - - curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash - - helm init --client-only - - helm package helm/passbook - - ./manage.py nexus_upload --method put --url $NEXUS_URL --auth $NEXUS_AUTH --repo helm *.tgz - only: - - tags - - /^version/.*$/ + stage: build + script: + - curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash + - helm init --client-only + - helm package helm/passbook + - ./manage.py nexus_upload --method put --url $NEXUS_URL --auth $NEXUS_AUTH --repo helm *.tgz + only: + - tags + - /^version/.*$/ package-debian: - before_script: - - apt update - - apt install -y --no-install-recommends build-essential debhelper devscripts equivs python3 python3-dev python3-pip libsasl2-dev libldap2-dev - - mk-build-deps debian/control - - apt install ./*build-deps*deb -f -y - - python3 -m pip install -U virtualenv pip - - virtualenv env - - source env/bin/activate - - pip3 install -U -r requirements.txt -r requirements-dev.txt - - ./manage.py collectstatic --no-input - image: ubuntu:18.04 - script: - - debuild -us -uc - - cp ../passbook*.deb . - - ./manage.py nexus_upload --method post --url $NEXUS_URL --auth $NEXUS_AUTH --repo apt passbook*deb - artifacts: - paths: - - passbook*deb - expire_in: 2 days - stage: build - only: - - tags - - /^version/.*$/ + before_script: + - apt update + - apt install -y --no-install-recommends build-essential debhelper devscripts equivs python3 python3-dev python3-pip libsasl2-dev libldap2-dev + - mk-build-deps debian/control + - apt install ./*build-deps*deb -f -y + - python3 -m pip install -U virtualenv pip + - virtualenv env + - source env/bin/activate + - pip3 install -U -r requirements.txt -r requirements-dev.txt + - ./manage.py collectstatic --no-input + image: ubuntu:18.04 + script: + - debuild -us -uc + - cp ../passbook*.deb . + - ./manage.py nexus_upload --method post --url $NEXUS_URL --auth $NEXUS_AUTH --repo apt passbook*deb + artifacts: + paths: + - passbook*deb + expire_in: 2 days + stage: build + only: + - tags + - /^version/.*$/ + +package-client-package-allauth: + script: + - cd client-packages/allauth + - python setup.py sdist + - twine upload --username $TWINE_USERNAME --password $TWINE_PASSWORD dist/* + stage: build + only: + refs: + - tags + - /^version/.*$/ + changes: + - client-packages/allauth/** + +package-client-package-sentry: + script: + - cd client-packages/sentry-auth-passbook + - python setup.py sdist + - twine upload --username $TWINE_USERNAME --password $TWINE_PASSWORD dist/* + stage: build + only: + refs: + - tags + - /^version/.*$/ + changes: + - client-packages/sentry-auth-passbook/** # docs: # stage: docs diff --git a/.prospector.yaml b/.prospector.yaml index 42ef1d149..35617deea 100644 --- a/.prospector.yaml +++ b/.prospector.yaml @@ -7,6 +7,7 @@ ignore-paths: - migrations - docs - node_modules + - client-packages uses: - django diff --git a/client-packages/allauth/setup.py b/client-packages/allauth/setup.py index 586fd1622..ca80e7c66 100644 --- a/client-packages/allauth/setup.py +++ b/client-packages/allauth/setup.py @@ -3,7 +3,7 @@ from setuptools import setup setup( name='django-allauth-passbook', - version='1.0.0', + version='0.1.17-beta', description='passbook support for django-allauth', # long_description='\n'.join(read_simple('docs/index.md')[2:]), long_description_content_type='text/markdown', diff --git a/client-packages/sentry-auth-passbook/setup.py b/client-packages/sentry-auth-passbook/setup.py index 1fd481de8..a04aa663e 100644 --- a/client-packages/sentry-auth-passbook/setup.py +++ b/client-packages/sentry-auth-passbook/setup.py @@ -18,7 +18,7 @@ tests_require = [ setup( name='sentry-auth-passbook', - version='1.0.0', + version='0.1.17-beta', author='BeryJu.org', author_email='support@beryju.org', url='https://passbook.beryju.org', diff --git a/requirements-dev.txt b/requirements-dev.txt index 9153c1bf5..fedef8ce9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -13,3 +13,4 @@ unittest-xml-reporting autopep8 bandit bumpversion +twine