Skip to content

Commit 386de22

Browse files
author
Davide Moro
committed
fix tests
1 parent bafa494 commit 386de22

File tree

4 files changed

+38
-36
lines changed

4 files changed

+38
-36
lines changed

{{cookiecutter.project_slug}}/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ FROM python:3.6-alpine
33
COPY . /src
44
WORKDIR /src
55

6+
67
RUN pip3 install --upgrade pip \
78
tox
89

910
ENTRYPOINT [ "tox"]
10-
CMD ["-epy36", "--", "-vvv", "--splinter-webdriver=remote", "--variables=credentials_template.yml", "--splinter-remote-url=http://{{cookiecutter.browserstack_username}}:{{cookiecutter.browserstack_access_key}}@hub.browserstack.com:80/wd/hub", "--variables capabilities/os/WIN10.json", "--variables capabilities/browsers/chrome/CHROME59.json", "--variables capabilities/resolutions/1280x1024.json"]
11+
CMD ["-epy36", "--", "-vvv", "--splinter-webdriver=remote", "--variables=credentials_template.yml", "--splinter-remote-url=http://{{cookiecutter.browserstack_username}}:{{cookiecutter.browserstack_access_key}}@hub.browserstack.com:80/wd/hub", "--variables=capabilities/os/WIN10.json", "--variables=capabilities/browsers/chrome/CHROME59.json", "--variables=capabilities/resolutions/1280x1024.json"]

{{cookiecutter.project_slug}}/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ docker-build:
8989
docker build -t {{cookiecutter.project_slug}} -t {{cookiecutter.project_slug}}:latest --cache-from {{cookiecutter.project_slug}}:latest .
9090

9191
docker-run: docker-build
92-
docker run --rm -i {{cookiecutter.project_slug}} -v ~/.cache/pip:/root/.cache/pip
92+
docker run --rm -v `eval echo $(echo -n "~$(whoami)")`/.cache/pip:/root/.cache/pip -i {{cookiecutter.project_slug}}
Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,54 @@
11
alabaster==0.7.10
2-
Babel==2.5.0
3-
click==6.7
4-
colander==1.4
2+
apipkg==1.4
3+
appdirs==1.4.3
4+
Babel==2.4.0
5+
colander==1.3.3
56
configparser==3.5.0
6-
coverage==4.4.1
7-
docutils==0.14
7+
coverage==4.4b1
8+
docutils==0.13.1
9+
execnet==1.4.1
810
funcsigs==1.0.2
9-
glob2==0.6
11+
glob2==0.5
1012
imagesize==0.7.1
11-
iso8601==0.1.12
13+
iso8601==0.1.11
1214
Jinja2==2.9.6
13-
Mako==1.0.7
15+
Mako==1.0.6
1416
MarkupSafe==1.0
1517
mock==2.0.0
16-
parse==1.8.2
18+
packaging==16.8
19+
parse==1.8.0
1720
parse-type==0.3.4
18-
pbr==3.1.1
19-
pluggy==0.5.2
20-
py==1.4.34
21-
pycodestyle==2.3.1
21+
pbr==3.0.0
22+
pluggy==0.4.0
23+
py==1.4.33
2224
Pygments==2.2.0
23-
PyPOM==1.2.0
25+
pyparsing==2.2.0
26+
PyPOM==1.1.1
2427
pypom-form==0.2.2
25-
pytest==3.2.2
26-
pytest-bdd==2.18.2
27-
pytest-cov==2.5.1
28-
pytest-html==1.15.2
29-
pytest-metadata==1.5.0
3028
pytest-pypom-navigation==0.0.1
31-
pytest-splinter==1.8.5
29+
pytest==3.0.7
30+
pytest-bdd==2.18.1
31+
pytest-cov==2.4.0
32+
pytest-html==1.14.2
33+
pytest-metadata==1.3.0
34+
pytest-splinter==1.8.1
3235
pytest-testrail==0.0.11
36+
pytest-travis-fold==1.2.0
3337
pytest-variables==1.7.0
38+
pytest-xdist==1.20.0
3439
pytz==2017.2
3540
PyYAML==3.12
36-
requests==2.18.4
37-
selenium==3.5.0
38-
setuptools==36.4.0
39-
simplejson==3.11.1
41+
requests==2.11.1
42+
selenium==3.3.1
43+
simplejson==3.10.0
4044
six==1.10.0
4145
snowballstemmer==1.2.1
42-
Sphinx==1.6.3
46+
Sphinx==1.5.5
4347
sphinx-rtd-theme==0.2.4
44-
sphinxcontrib-websupport==1.0.1
45-
splinter==0.7.6
46-
tox==2.8.2
48+
splinter==0.7.5
49+
tox==2.7.0
4750
translationstring==1.3
48-
typing==3.6.2
4951
virtualenv==15.1.0
50-
zope.component==4.4.0
51-
zope.dottedname==4.2
52-
zope.event==4.3.0
53-
zope.interface==4.4.2
52+
zope.component==4.3.0
53+
zope.event==4.2.0
54+
zope.interface==4.4.0

{{cookiecutter.project_slug}}/tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py27,py35
2+
envlist = py36
33
skip_missing_interpreters = true
44

55
[testenv]

0 commit comments

Comments
 (0)