Skip to content

Commit

Permalink
replace travis with gitlab ci / use wildcard dependency versions (#146)
Browse files Browse the repository at this point in the history
* use wildcard versions for dependencies

* add 3.8 runtime for travis

* add initial gitlab pipeline

* add external_pull_requests to only

* remove travis config

* add publish jobs
  • Loading branch information
treethought committed Nov 26, 2020
1 parent adc4cff commit dffd481
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 35 deletions.
64 changes: 64 additions & 0 deletions .gitlab-ci.yml
@@ -0,0 +1,64 @@
stages:
- test
- publish


# base test job
.test:
stage: test
before_script:
- pip install pipenv
- pipenv install --dev --skip-lock
script:
- pipenv run pytest tests/

only:
refs:
- merge_requests
- master
- main
- external_pull_requests


test:3.5:
extends: .test
image: python:3.5-buster


test:3.6:
extends: .test
image: python:3.6-buster

test:3.7:
extends: .test
image: python:3.7-buster

test:3.8:
extends: .test
image: python:3.8-buster

.publish:
stage: publish
image: python:3.7-buster
before_script:
- pip install setuptools wheel twine
- python setup.py sdist bdist_wheel
- twine check dist/*


publish:staging:
extends: .publish
script:
- twine upload --repository-url https://test.pypi.org/legacy/ dist/*
only:
refs:
- /^v[0-9]+\.[0-9]+\.[0-9]-rc\.[1-9]+$/

publish:prod:
extends: .publish
when: manual
script:
- twine upload dist/*
only:
refs:
- /^v[0-9]+\.[0-9]+\.[0-9]$/
12 changes: 0 additions & 12 deletions .travis.yml

This file was deleted.

24 changes: 12 additions & 12 deletions Pipfile
Expand Up @@ -10,18 +10,18 @@ tox = "*"
flask-assistant = {editable = true,path = "."}

[packages]
aniso8601 = "==4.0.1"
certifi = "==2018.11.29"
chardet = "==3.0.4"
click = "==7.0"
idna = "==2.8"
itsdangerous = "==1.1.0"
requests = "==2.21.0"
urllib3 = "==1.24.2"
Flask = "==1.1.1"
MarkupSafe = "==1.1.0"
"ruamel.yaml" = "==0.15.81"
Werkzeug = "==0.15.3"
aniso8601 = "*"
certifi = "*"
chardet = "*"
click = "*"
idna = "*"
itsdangerous = "*"
requests = "*"
urllib3 = "*"
Flask = ">1.0.2"
MarkupSafe = "*"
"ruamel.yaml" = "*"
Werkzeug = "*"
google-auth = "*"
dialogflow = "*"

Expand Down
24 changes: 13 additions & 11 deletions requirements.txt
@@ -1,25 +1,27 @@
aniso8601==4.0.1
-i https://pypi.org/simple
aniso8601==8.0.0
cachetools==4.1.1
certifi==2018.11.29
certifi==2020.11.8
chardet==3.0.4
click==7.0
click==7.1.2
dialogflow==1.1.0
flask==1.1.1
flask==1.1.2
google-api-core[grpc]==1.23.0
google-auth==1.23.0
googleapis-common-protos==1.52.0
grpcio==1.34.0rc1
idna==2.8
itsdangerous==1.1.0
idna==2.10
itsdangerous==2.0.0a1
jinja2==3.0.0a1
markupsafe==1.1.0
markupsafe==2.0.0a1
protobuf==4.0.0rc2
pyasn1-modules==0.2.8
pyasn1==0.4.8
pytz==2020.4
requests==2.21.0
requests==2.25.0
rsa==4.6 ; python_version >= '3.5'
ruamel.yaml==0.15.81
ruamel.yaml.clib==0.2.2 ; platform_python_implementation == 'CPython' and python_version < '3.9'
ruamel.yaml==0.16.12
six==1.15.0
urllib3==1.24.2
werkzeug==0.15.3
urllib3==1.26.2
werkzeug==1.0.1

0 comments on commit dffd481

Please sign in to comment.