Skip to content
This repository was archived by the owner on Jun 26, 2025. It is now read-only.

Commit dffd481

Browse files
authored
replace travis with gitlab ci / use wildcard dependency versions (#146)
* 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
1 parent adc4cff commit dffd481

File tree

4 files changed

+89
-35
lines changed

4 files changed

+89
-35
lines changed

.gitlab-ci.yml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
stages:
2+
- test
3+
- publish
4+
5+
6+
# base test job
7+
.test:
8+
stage: test
9+
before_script:
10+
- pip install pipenv
11+
- pipenv install --dev --skip-lock
12+
script:
13+
- pipenv run pytest tests/
14+
15+
only:
16+
refs:
17+
- merge_requests
18+
- master
19+
- main
20+
- external_pull_requests
21+
22+
23+
test:3.5:
24+
extends: .test
25+
image: python:3.5-buster
26+
27+
28+
test:3.6:
29+
extends: .test
30+
image: python:3.6-buster
31+
32+
test:3.7:
33+
extends: .test
34+
image: python:3.7-buster
35+
36+
test:3.8:
37+
extends: .test
38+
image: python:3.8-buster
39+
40+
.publish:
41+
stage: publish
42+
image: python:3.7-buster
43+
before_script:
44+
- pip install setuptools wheel twine
45+
- python setup.py sdist bdist_wheel
46+
- twine check dist/*
47+
48+
49+
publish:staging:
50+
extends: .publish
51+
script:
52+
- twine upload --repository-url https://test.pypi.org/legacy/ dist/*
53+
only:
54+
refs:
55+
- /^v[0-9]+\.[0-9]+\.[0-9]-rc\.[1-9]+$/
56+
57+
publish:prod:
58+
extends: .publish
59+
when: manual
60+
script:
61+
- twine upload dist/*
62+
only:
63+
refs:
64+
- /^v[0-9]+\.[0-9]+\.[0-9]$/

.travis.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

Pipfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ tox = "*"
1010
flask-assistant = {editable = true,path = "."}
1111

1212
[packages]
13-
aniso8601 = "==4.0.1"
14-
certifi = "==2018.11.29"
15-
chardet = "==3.0.4"
16-
click = "==7.0"
17-
idna = "==2.8"
18-
itsdangerous = "==1.1.0"
19-
requests = "==2.21.0"
20-
urllib3 = "==1.24.2"
21-
Flask = "==1.1.1"
22-
MarkupSafe = "==1.1.0"
23-
"ruamel.yaml" = "==0.15.81"
24-
Werkzeug = "==0.15.3"
13+
aniso8601 = "*"
14+
certifi = "*"
15+
chardet = "*"
16+
click = "*"
17+
idna = "*"
18+
itsdangerous = "*"
19+
requests = "*"
20+
urllib3 = "*"
21+
Flask = ">1.0.2"
22+
MarkupSafe = "*"
23+
"ruamel.yaml" = "*"
24+
Werkzeug = "*"
2525
google-auth = "*"
2626
dialogflow = "*"
2727

requirements.txt

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
1-
aniso8601==4.0.1
1+
-i https://pypi.org/simple
2+
aniso8601==8.0.0
23
cachetools==4.1.1
3-
certifi==2018.11.29
4+
certifi==2020.11.8
45
chardet==3.0.4
5-
click==7.0
6+
click==7.1.2
67
dialogflow==1.1.0
7-
flask==1.1.1
8+
flask==1.1.2
89
google-api-core[grpc]==1.23.0
910
google-auth==1.23.0
1011
googleapis-common-protos==1.52.0
1112
grpcio==1.34.0rc1
12-
idna==2.8
13-
itsdangerous==1.1.0
13+
idna==2.10
14+
itsdangerous==2.0.0a1
1415
jinja2==3.0.0a1
15-
markupsafe==1.1.0
16+
markupsafe==2.0.0a1
1617
protobuf==4.0.0rc2
1718
pyasn1-modules==0.2.8
1819
pyasn1==0.4.8
1920
pytz==2020.4
20-
requests==2.21.0
21+
requests==2.25.0
2122
rsa==4.6 ; python_version >= '3.5'
22-
ruamel.yaml==0.15.81
23+
ruamel.yaml.clib==0.2.2 ; platform_python_implementation == 'CPython' and python_version < '3.9'
24+
ruamel.yaml==0.16.12
2325
six==1.15.0
24-
urllib3==1.24.2
25-
werkzeug==0.15.3
26+
urllib3==1.26.2
27+
werkzeug==1.0.1

0 commit comments

Comments
 (0)