Skip to content

Commit bdb3ab6

Browse files
committed
Merge branch 'devdev' into feature/golony/add-dep
2 parents 29e0cb3 + 72c0160 commit bdb3ab6

9 files changed

+258
-4
lines changed

.github/workflows/pull-request-merge-precondition.yml

+25-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ name: Pull Request Merge Precondition
33
on:
44
pull_request:
55

6+
permissions:
7+
contents: read
8+
pull-requests: write
9+
610
jobs:
711
build:
812
runs-on: ubuntu-latest
@@ -11,7 +15,11 @@ jobs:
1115
python-version: [3.8]
1216

1317
steps:
14-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
19+
with:
20+
persist-credentials: true # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
21+
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
22+
1523
- uses: psf/black@stable
1624
with:
1725
options: "--check --verbose --exclude migrations"
@@ -20,3 +28,19 @@ jobs:
2028
with:
2129
configuration: "--check-only --diff --profile black"
2230
requirementsFiles: "requirements.txt"
31+
32+
- name: install dependencies
33+
run: |
34+
python -m pip install --upgrade pip
35+
pip install -r requirements-dev.txt
36+
pip install pytest-cov
37+
38+
- name: run pytest
39+
run: |
40+
pytest --junitxml=pytest.xml --cov-report=term-missing:skip-covered --cov=pyconkr ./ | tee pytest-coverage.txt
41+
42+
#- name: Pytest coverage comment
43+
# uses: MishaKav/pytest-coverage-comment@main
44+
# with:
45+
# pytest-coverage-path: ./pytest-coverage.txt
46+
# junitxml-path: ./pytest.xml

.gitignore

+160-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,160 @@
1-
/.idea
2-
/db.sqlite3
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[cod]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
build/
12+
develop-eggs/
13+
dist/
14+
downloads/
15+
eggs/
16+
.eggs/
17+
lib/
18+
lib64/
19+
parts/
20+
sdist/
21+
var/
22+
wheels/
23+
share/python-wheels/
24+
*.egg-info/
25+
.installed.cfg
26+
*.egg
27+
MANIFEST
28+
29+
# PyInstaller
30+
# Usually these files are written by a python script from a template
31+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
32+
*.manifest
33+
*.spec
34+
35+
# Installer logs
36+
pip-log.txt
37+
pip-delete-this-directory.txt
38+
39+
# Unit test / coverage reports
40+
htmlcov/
41+
.tox/
42+
.nox/
43+
.coverage
44+
.coverage.*
45+
.cache
46+
nosetests.xml
47+
coverage.xml
48+
*.cover
49+
*.py,cover
50+
.hypothesis/
51+
.pytest_cache/
52+
cover/
53+
54+
# Translations
55+
*.mo
56+
*.pot
57+
58+
# Django stuff:
59+
*.log
60+
local_settings.py
61+
db.sqlite3
62+
db.sqlite3-journal
63+
64+
# Flask stuff:
65+
instance/
66+
.webassets-cache
67+
68+
# Scrapy stuff:
69+
.scrapy
70+
71+
# Sphinx documentation
72+
docs/_build/
73+
74+
# PyBuilder
75+
.pybuilder/
76+
target/
77+
78+
# Jupyter Notebook
79+
.ipynb_checkpoints
80+
81+
# IPython
82+
profile_default/
83+
ipython_config.py
84+
85+
# pyenv
86+
# For a library or package, you might want to ignore these files since the code is
87+
# intended to run in multiple environments; otherwise, check them in:
88+
# .python-version
89+
90+
# pipenv
91+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
92+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
93+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
94+
# install all needed dependencies.
95+
#Pipfile.lock
96+
97+
# poetry
98+
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
99+
# This is especially recommended for binary packages to ensure reproducibility, and is more
100+
# commonly ignored for libraries.
101+
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
102+
#poetry.lock
103+
104+
# pdm
105+
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
106+
#pdm.lock
107+
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
108+
# in version control.
109+
# https://pdm.fming.dev/#use-with-ide
110+
.pdm.toml
111+
112+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
113+
__pypackages__/
114+
115+
# Celery stuff
116+
celerybeat-schedule
117+
celerybeat.pid
118+
119+
# SageMath parsed files
120+
*.sage.py
121+
122+
# Environments
123+
.env
124+
.venv
125+
env/
126+
venv/
127+
ENV/
128+
env.bak/
129+
venv.bak/
130+
131+
# Spyder project settings
132+
.spyderproject
133+
.spyproject
134+
135+
# Rope project settings
136+
.ropeproject
137+
138+
# mkdocs documentation
139+
/site
140+
141+
# mypy
142+
.mypy_cache/
143+
.dmypy.json
144+
dmypy.json
145+
146+
# Pyre type checker
147+
.pyre/
148+
149+
# pytype static type analyzer
150+
.pytype/
151+
152+
# Cython debug symbols
153+
cython_debug/
154+
155+
# PyCharm
156+
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
157+
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
158+
# and can be added to the global gitignore or merged into this file. For a more nuclear
159+
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
160+
#.idea/

README.md

+8
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,11 @@
1010
* mac
1111
* brew install mysql-client
1212
* pip install -r requirements.txt
13+
14+
## how to run localtesting ( sqlite3 based )
15+
```
16+
# to setup pytest and requirements
17+
pip install -r requirements-dev.txt
18+
# run test
19+
pytest
20+
```

conftest.py

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import pytest
2+
3+
4+
# TODO
5+
# https://djangostars.com/blog/django-pytest-testing/#header17
6+
@pytest.fixture
7+
def api_client():
8+
from rest_framework.test import APIClient
9+
10+
return APIClient()

manage.py

100644100755
File mode changed.

pyconkr/settings-localtest.py

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import os
2+
3+
from pyconkr.settings import *
4+
5+
DEBUG = True
6+
7+
ALLOWED_HOSTS += [
8+
"*",
9+
]
10+
11+
12+
# RDS
13+
DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3", "NAME": ":memory:"}}
14+
15+
# django-storages: TODO fix to in memory?
16+
del MEDIA_ROOT
17+
DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
18+
STATICFILES_STORAGE = "storages.backends.s3boto3.S3StaticStorage"
19+
AWS_S3_ACCESS_KEY_ID = os.getenv("AWS_S3_ACCESS_KEY_ID")
20+
AWS_S3_SECRET_ACCESS_KEY = os.getenv("AWS_S3_SECRET_ACCESS_KEY")
21+
AWS_STORAGE_BUCKET_NAME = "pyconkr-api-v2-static-dev"

pytest.ini

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[pytest]
2+
DJANGO_SETTINGS_MODULE = pyconkr.settings-localtest
3+
# -- recommended but optional:
4+
python_files = tests.py test_*.py *_tests.py
5+
addopts = --no-migrations

requirements-dev.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-r requirements.txt
2+
black
3+
isort
4+
pytest
5+
pytest-django

sponsor/tests.py

+24-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1-
from django.test import TestCase
1+
import pytest
2+
from django.contrib.auth import get_user_model
3+
4+
from sponsor.models import SponsorLevel
5+
6+
pytestmark = pytest.mark.django_db
7+
8+
UserModel = get_user_model()
9+
10+
11+
@pytest.mark.django_db
12+
class TestSponsorLevelModel:
13+
pytestmark = pytest.mark.django_db
14+
15+
def test_sponsor_level_creation_success(self):
16+
assert SponsorLevel.objects.count() == 0
17+
SponsorLevel.objects.create(
18+
name="test",
19+
desc="test desc",
20+
visible=True,
21+
limit=1,
22+
)
23+
assert SponsorLevel.objects.count() != 0
24+
225

326
# Create your tests here.

0 commit comments

Comments
 (0)