Skip to content

Commit

Permalink
충돌 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
Jixoo-IT committed Aug 4, 2022
2 parents 56d6ec8 + 4c0ccbd commit 8cc791d
Show file tree
Hide file tree
Showing 6 changed files with 91 additions and 0 deletions.
69 changes: 69 additions & 0 deletions myvenv/bin/activate
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# This file must be used with "source bin/activate" *from bash*
# you cannot run it directly

deactivate () {
# reset old environment variables
if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then
PATH="${_OLD_VIRTUAL_PATH:-}"
export PATH
unset _OLD_VIRTUAL_PATH
fi
if [ -n "${_OLD_VIRTUAL_PYTHONHOME:-}" ] ; then
PYTHONHOME="${_OLD_VIRTUAL_PYTHONHOME:-}"
export PYTHONHOME
unset _OLD_VIRTUAL_PYTHONHOME
fi

# This should detect bash and zsh, which have a hash command that must
# be called to get it to forget past commands. Without forgetting
# past commands the $PATH changes we made may not be respected
if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
hash -r 2> /dev/null
fi

if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then
PS1="${_OLD_VIRTUAL_PS1:-}"
export PS1
unset _OLD_VIRTUAL_PS1
fi

unset VIRTUAL_ENV
unset VIRTUAL_ENV_PROMPT
if [ ! "${1:-}" = "nondestructive" ] ; then
# Self destruct!
unset -f deactivate
fi
}

# unset irrelevant variables
deactivate nondestructive

VIRTUAL_ENV="/Users/ahyeonlim/Otr-Server/myvenv"
export VIRTUAL_ENV

_OLD_VIRTUAL_PATH="$PATH"
PATH="$VIRTUAL_ENV/bin:$PATH"
export PATH

# unset PYTHONHOME if set
# this will fail if PYTHONHOME is set to the empty string (which is bad anyway)
# could use `if (set -u; : $PYTHONHOME) ;` in bash
if [ -n "${PYTHONHOME:-}" ] ; then
_OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}"
unset PYTHONHOME
fi

if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then
_OLD_VIRTUAL_PS1="${PS1:-}"
PS1="(myvenv) ${PS1:-}"
export PS1
VIRTUAL_ENV_PROMPT="(myvenv) "
export VIRTUAL_ENV_PROMPT
fi

# This should detect bash and zsh, which have a hash command that must
# be called to get it to forget past commands. Without forgetting
# past commands the $PATH changes we made may not be respected
if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
hash -r 2> /dev/null
fi
8 changes: 8 additions & 0 deletions myvenv/bin/pip3.10
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/Users/ahyeonlim/Otr-Server/myvenv/bin/python3
# -*- coding: utf-8 -*-
import re
import sys
from pip._internal.cli.main import main
if __name__ == '__main__':
sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
sys.exit(main())
8 changes: 8 additions & 0 deletions myvenv/bin/sqlformat
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/Users/ahyeonlim/Otr-Server/myvenv/bin/python3
# -*- coding: utf-8 -*-
import re
import sys
from sqlparse.__main__ import main
if __name__ == '__main__':
sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
sys.exit(main())
2 changes: 2 additions & 0 deletions yuseo/yuseo/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@

DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
MEDIA_URL = '/media/'

NAVER_CLIENT_ID = 'rA0H6_4YbABuGWvVnnsF'
NAVER_SECRET_KEY = '72o6kCBNpY'
Expand Down
1 change: 1 addition & 0 deletions yuseo/yuseo/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
# config/urls.py
urlpatterns = [
path('admin/', admin.site.urls),
path('', include('yuseoapp.urls'))
path('accounts/', include('allauth.urls')), # 로깅 추가
path('users/', include('users.urls')),

Expand Down
3 changes: 3 additions & 0 deletions yuseo/yuseoapp/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
from dataclasses import field, fields
from rest_framework import serializers
from .models import Yuseo





class YuseoSerializer(serializers.ModelSerializer):
Expand Down

0 comments on commit 8cc791d

Please sign in to comment.