Skip to content
This repository was archived by the owner on Mar 31, 2020. It is now read-only.

Commit dd44b6d

Browse files
committed
Merge branch 'dev' into staging
2 parents 50e899c + 31fd9ce commit dd44b6d

File tree

23 files changed

+975
-34
lines changed

23 files changed

+975
-34
lines changed

.flake8

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
[flake8]
12
max-line-length=100
2-
application_import_names=projectt
3+
application_import_names=src
34
ignore=P102,B311,W503,E226,S311,W504,F821
45
exclude=__pycache__, venv, .venv, tests
56
import-order-style=pycharm

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,5 @@ venv.bak/
103103
# mypy
104104
.mypy_cache/
105105

106+
# Editor files
107+
.vscode

Pipfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,19 @@ verify_ssl = true
55

66
[dev-packages]
77
flake8 = "*"
8-
flake8-docstrings = "*"
8+
pytest = "*"
99

1010
[packages]
11+
more-itertools = "*"
12+
pillow = "*"
13+
pygame = "*"
14+
aiohttp = "*"
15+
configparser = "*"
1116

1217
[requires]
1318
python_version = "3.7"
1419

1520
[scripts]
1621
lint = "python -m flake8"
22+
start = "python -m src"
23+
test = "python -m pytest"

Pipfile.lock

Lines changed: 251 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

res/images/1.jpg

62.3 KB
Loading

res/images/10.jpg

54.5 KB
Loading

res/images/2.jpg

35.6 KB
Loading

res/images/3.jpg

403 KB
Loading

res/images/4.jpg

189 KB
Loading

res/images/5.jpg

33.3 KB
Loading

0 commit comments

Comments
 (0)