Skip to content

Commit f7aeff5

Browse files
committed
Rebased and changed email
1 parent 47c470f commit f7aeff5

39 files changed

+48
-52
lines changed

.travis.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@ services:
1111
- mysql
1212
- redis
1313

14-
install:
15-
- pip install -r backend/requirements.txt
16-
- npm install -g newman
17-
18-
before_script:
19-
- node --version
20-
- npm --version
21-
- newman --version
22-
2314
# TODO: Reformat file as it is ugly. separatee jobs in yml, and lint as the last job to run
2415

2516
jobs:
@@ -33,9 +24,12 @@ jobs:
3324
- docker build -t docker.pkg.github.com/seluj78/pymatcha/pymatcha-api:latest .
3425
# push image
3526
- docker push docker.pkg.github.com/seluj78/pymatcha/pymatcha-api:latest
36-
- stage: lint
37-
script: make lint
3827
- stage: test
28+
before_script:
29+
- node --version
30+
- npm --version
31+
- npm install -g newman
32+
- newman --version
3933
script:
4034
# login to github registry
4135
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin docker.pkg.github.com
@@ -54,12 +48,15 @@ jobs:
5448
- docker stop $(docker ps -a -q)
5549
- docker rm $(docker ps -a -q)
5650
- stage: lint
57-
script: black --check backend
51+
before_script:
52+
- pip install -r backend/requirements.txt
53+
script:
54+
- black --check backend
5855

5956
notifications:
6057
email:
6158
recipients:
6259
- jlasne@student.42.fr
63-
- gmorer@student.42.fr
60+
- lauris.skraucis@gmail.com
6461
on_success: change
6562
on_failure: always

backend/PyMatcha/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
PyMatcha - A Python Dating Website
33
Copyright (C) 2018-2019 jlasne/gmorer
4-
<jlasne@student.42.fr> - <gmorer@student.42.fr>
4+
<jlasne@student.42.fr> - <lauris.skraucis@gmail.com>
55
66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by

backend/PyMatcha/models/like.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
PyMatcha - A Python Dating Website
33
Copyright (C) 2018-2019 jlasne/gmorer
4-
<jlasne@student.42.fr> - <gmorer@student.42.fr>
4+
<jlasne@student.42.fr> - <lauris.skraucis@gmail.com>
55
66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by

backend/PyMatcha/models/match.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
PyMatcha - A Python Dating Website
33
Copyright (C) 2018-2019 jlasne/gmorer
4-
<jlasne@student.42.fr> - <gmorer@student.42.fr>
4+
<jlasne@student.42.fr> - <lauris.skraucis@gmail.com>
55
66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by

backend/PyMatcha/models/message.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
PyMatcha - A Python Dating Website
33
Copyright (C) 2018-2019 jlasne/gmorer
4-
<jlasne@student.42.fr> - <gmorer@student.42.fr>
4+
<jlasne@student.42.fr> - <lauris.skraucis@gmail.com>
55
66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by

backend/PyMatcha/models/report.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
PyMatcha - A Python Dating Website
33
Copyright (C) 2018-2019 jlasne/gmorer
4-
<jlasne@student.42.fr> - <gmorer@student.42.fr>
4+
<jlasne@student.42.fr> - <lauris.skraucis@gmail.com>
55
66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by

backend/PyMatcha/models/tag.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
PyMatcha - A Python Dating Website
33
Copyright (C) 2018-2019 jlasne/gmorer
4-
<jlasne@student.42.fr> - <gmorer@student.42.fr>
4+
<jlasne@student.42.fr> - <lauris.skraucis@gmail.com>
55
66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by

backend/PyMatcha/models/user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
PyMatcha - A Python Dating Website
33
Copyright (C) 2018-2019 jlasne/gmorer
4-
<jlasne@student.42.fr> - <gmorer@student.42.fr>
4+
<jlasne@student.42.fr> - <lauris.skraucis@gmail.com>
55
66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by

backend/PyMatcha/models/view.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
PyMatcha - A Python Dating Website
33
Copyright (C) 2018-2019 jlasne/gmorer
4-
<jlasne@student.42.fr> - <gmorer@student.42.fr>
4+
<jlasne@student.42.fr> - <lauris.skraucis@gmail.com>
55
66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by

backend/PyMatcha/routes/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
PyMatcha - A Python Dating Website
33
Copyright (C) 2018-2019 jlasne/gmorer
4-
<jlasne@student.42.fr> - <gmorer@student.42.fr>
4+
<jlasne@student.42.fr> - <lauris.skraucis@gmail.com>
55
66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)