Skip to content

Commit 884e72d

Browse files
author
Vasily Fotin
committed
Merge branch 'master-ExpDev07'
# Conflicts: # Pipfile # Pipfile.lock # app/__init__.py # app/data/__init__.py # app/routes/__init__.py
2 parents 24d8b9b + 73c6922 commit 884e72d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3620
-204
lines changed

.all-contributorsrc

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,126 @@
3333
"contributions": [
3434
"doc"
3535
]
36+
},
37+
{
38+
"login": "gribok",
39+
"name": "GRIBOK",
40+
"avatar_url": "https://avatars1.githubusercontent.com/u/40306040?v=4",
41+
"profile": "https://github.com/gribok",
42+
"contributions": [
43+
"code",
44+
"test"
45+
]
46+
},
47+
{
48+
"login": "oliver-xapix-io",
49+
"name": "Oliver Thamm",
50+
"avatar_url": "https://avatars0.githubusercontent.com/u/13470858?v=4",
51+
"profile": "https://github.com/oliver-xapix-io",
52+
"contributions": [
53+
"doc"
54+
]
55+
},
56+
{
57+
"login": "MM-coder",
58+
"name": "Mauro M.",
59+
"avatar_url": "https://avatars1.githubusercontent.com/u/22800592?v=4",
60+
"profile": "https://maurom.dev",
61+
"contributions": [
62+
"doc"
63+
]
64+
},
65+
{
66+
"login": "JKSenthil",
67+
"name": "JKSenthil",
68+
"avatar_url": "https://avatars2.githubusercontent.com/u/12533226?v=4",
69+
"profile": "https://github.com/JKSenthil",
70+
"contributions": [
71+
"code",
72+
"doc",
73+
"test"
74+
]
75+
},
76+
{
77+
"login": "SeanCena",
78+
"name": "SeanCena",
79+
"avatar_url": "https://avatars1.githubusercontent.com/u/17202203?v=4",
80+
"profile": "https://github.com/SeanCena",
81+
"contributions": [
82+
"code",
83+
"doc",
84+
"test"
85+
]
86+
},
87+
{
88+
"login": "Abdirahiim",
89+
"name": "Abdirahiim Yassin ",
90+
"avatar_url": "https://avatars0.githubusercontent.com/u/13730460?v=4",
91+
"profile": "https://github.com/Abdirahiim",
92+
"contributions": [
93+
"doc",
94+
"tool",
95+
"platform"
96+
]
97+
},
98+
{
99+
"login": "kant",
100+
"name": "Darío Hereñú",
101+
"avatar_url": "https://avatars1.githubusercontent.com/u/32717?v=4",
102+
"profile": "https://github.com/kant",
103+
"contributions": [
104+
"doc"
105+
]
106+
},
107+
{
108+
"login": "o-ba",
109+
"name": "Oliver",
110+
"avatar_url": "https://avatars1.githubusercontent.com/u/8812114?v=4",
111+
"profile": "https://github.com/o-ba",
112+
"contributions": [
113+
"doc"
114+
]
115+
},
116+
{
117+
"login": "carmelag",
118+
"name": "carmelag",
119+
"avatar_url": "https://avatars0.githubusercontent.com/u/5394906?v=4",
120+
"profile": "http://www.carmelagreco.dev",
121+
"contributions": [
122+
"doc"
123+
]
124+
},
125+
{
126+
"login": "Kilo59",
127+
"name": "Gabriel",
128+
"avatar_url": "https://avatars3.githubusercontent.com/u/13108583?v=4",
129+
"profile": "https://github.com/Kilo59",
130+
"contributions": [
131+
"code",
132+
"infra",
133+
"test",
134+
"doc"
135+
]
136+
},
137+
{
138+
"login": "egbakou",
139+
"name": "Kodjo Laurent Egbakou",
140+
"avatar_url": "https://avatars0.githubusercontent.com/u/26142591?v=4",
141+
"profile": "https://lioncoding.com",
142+
"contributions": [
143+
"doc",
144+
"tool",
145+
"platform"
146+
]
147+
},
148+
{
149+
"login": "Turreted",
150+
"name": "Turreted",
151+
"avatar_url": "https://avatars2.githubusercontent.com/u/41593269?v=4",
152+
"profile": "https://github.com/Turreted",
153+
"contributions": [
154+
"code"
155+
]
36156
}
37157
],
38158
"contributorsPerLine": 7,

.github/FUNDING.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# These are supported funding model platforms
2+
3+
#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
#patreon: # Replace with a single Patreon username
5+
#open_collective: # Replace with a single Open Collective username
6+
ko_fi: ExpDev
7+
#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
#liberapay: # Replace with a single Liberapay username
10+
#issuehunt: # Replace with a single IssueHunt username
11+
#otechie: # Replace with a single Otechie username
12+
#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
__pycache__/
99
*.py[cod]
1010

11+
# Testing
12+
.pytest_cache/
13+
1114
# C extensions
1215
*.so
1316

@@ -60,4 +63,7 @@ coverage.xml
6063
docs/_build/
6164

6265
# PyBuilder
63-
target/
66+
target/
67+
68+
# OSX Stuff
69+
.DS_Store

.travis.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
language: python
2+
python:
3+
- "3.6"
4+
- "3.7"
5+
- "3.8"
6+
install:
7+
- "pip install pipenv"
8+
- "pipenv install --dev --skip-lock"
9+
script:
10+
- "make test lint check-fmt"

0 commit comments

Comments
 (0)