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

Commit 22ad950

Browse files
committed
Merge branch 'staging'
2 parents 50e899c + db4d5bf commit 22ad950

34 files changed

+1165
-35
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: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,20 @@ 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 = "*"
16+
requests = "*"
1117

1218
[requires]
1319
python_version = "3.7"
1420

1521
[scripts]
1622
lint = "python -m flake8"
23+
start = "python -m src"
24+
test = "python -m pytest"

Pipfile.lock

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

res/api.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"image": "https://api.thecatapi.com/v1/images/search",
3+
"info": "https://www.pawclub.com.au/assets/js/namesTemp.json",
4+
"hobbies": "https://gist.githubusercontent.com/mbejda/453fdb77ef8d4d3b3a67/raw/e8334f09109dc212892406e25fdee03efdc23f56/hobbies.txt"
5+
}

res/docs/intro.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Note:
2+
3+
Through this quiz you will achieve new levels of spiritual insight, of not only yourself, but the very fabric of reality.
4+
5+
Please answer these very important questions with the utmost honesty, they are crucial to achieving true enlightenment.

res/docs/questions.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"What is your least favorite color?": ["#0801d5", "#ee018d", "#03a130", "#db0013", "#fd9501"]
3+
}

res/images/1.jpg

62.3 KB
Loading

res/images/10.jpg

54.5 KB
Loading

res/images/2.jpg

35.6 KB
Loading

0 commit comments

Comments
 (0)