From 5d801116389f184602198c5a15bf0da5566fc2bf Mon Sep 17 00:00:00 2001 From: Alexander Bogushov Date: Wed, 26 Jul 2017 16:28:08 +0500 Subject: [PATCH] Refactoring of example --- .../json_editor_example => example}/README.md | 2 +- .../app/__init__.py | 0 .../app/admin.py | 0 .../app/apps.py | 0 .../app/migrations/0001_initial.py | 0 .../app/migrations/__init__.py | 0 .../app/models.py | 0 .../example.png | Bin .../json_editor_example => example}/manage.py | 0 .../project/__init__.py | 0 .../project/settings.py | 2 +- example/project/urls.py | 6 ++ example/project/wsgi.py | 7 ++ example/requirements.txt | 2 + example/venv/bin/activate | 76 ++++++++++++++++++ example/venv/bin/activate.csh | 37 +++++++++ example/venv/bin/activate.fish | 75 +++++++++++++++++ example/venv/bin/django-admin | 11 +++ example/venv/bin/django-admin.py | 5 ++ example/venv/bin/easy_install | 11 +++ example/venv/bin/easy_install-3.6 | 11 +++ example/venv/bin/pip | 11 +++ example/venv/bin/pip3 | 11 +++ example/venv/bin/pip3.6 | 11 +++ example/venv/bin/python | 1 + example/venv/bin/python3 | 1 + example/venv/pip-selfcheck.json | 1 + example/venv/pyvenv.cfg | 3 + examples/json_editor_example/.gitignore | 2 - examples/json_editor_example/project/urls.py | 21 ----- examples/json_editor_example/project/wsgi.py | 16 ---- examples/json_editor_example/requirements.txt | 3 - 32 files changed, 282 insertions(+), 44 deletions(-) rename {examples/json_editor_example => example}/README.md (90%) rename {examples/json_editor_example => example}/app/__init__.py (100%) rename {examples/json_editor_example => example}/app/admin.py (100%) rename {examples/json_editor_example => example}/app/apps.py (100%) rename {examples/json_editor_example => example}/app/migrations/0001_initial.py (100%) rename {examples/json_editor_example => example}/app/migrations/__init__.py (100%) rename {examples/json_editor_example => example}/app/models.py (100%) rename {examples/json_editor_example => example}/example.png (100%) rename {examples/json_editor_example => example}/manage.py (100%) rename {examples/json_editor_example => example}/project/__init__.py (100%) rename {examples/json_editor_example => example}/project/settings.py (98%) create mode 100644 example/project/urls.py create mode 100644 example/project/wsgi.py create mode 100644 example/requirements.txt create mode 100644 example/venv/bin/activate create mode 100644 example/venv/bin/activate.csh create mode 100644 example/venv/bin/activate.fish create mode 100755 example/venv/bin/django-admin create mode 100755 example/venv/bin/django-admin.py create mode 100755 example/venv/bin/easy_install create mode 100755 example/venv/bin/easy_install-3.6 create mode 100755 example/venv/bin/pip create mode 100755 example/venv/bin/pip3 create mode 100755 example/venv/bin/pip3.6 create mode 120000 example/venv/bin/python create mode 120000 example/venv/bin/python3 create mode 100644 example/venv/pip-selfcheck.json create mode 100644 example/venv/pyvenv.cfg delete mode 100644 examples/json_editor_example/.gitignore delete mode 100644 examples/json_editor_example/project/urls.py delete mode 100644 examples/json_editor_example/project/wsgi.py delete mode 100644 examples/json_editor_example/requirements.txt diff --git a/examples/json_editor_example/README.md b/example/README.md similarity index 90% rename from examples/json_editor_example/README.md rename to example/README.md index c608d04..752d39a 100644 --- a/examples/json_editor_example/README.md +++ b/example/README.md @@ -6,7 +6,7 @@ To run example to this steps: python3 -m venv env . env/bin/activate pip install -r requirements.txt -createdb json_editor_example +createdb django_admin_json_editor python manage.py migrate python manage.py createsuperuser python manage.py runserver diff --git a/examples/json_editor_example/app/__init__.py b/example/app/__init__.py similarity index 100% rename from examples/json_editor_example/app/__init__.py rename to example/app/__init__.py diff --git a/examples/json_editor_example/app/admin.py b/example/app/admin.py similarity index 100% rename from examples/json_editor_example/app/admin.py rename to example/app/admin.py diff --git a/examples/json_editor_example/app/apps.py b/example/app/apps.py similarity index 100% rename from examples/json_editor_example/app/apps.py rename to example/app/apps.py diff --git a/examples/json_editor_example/app/migrations/0001_initial.py b/example/app/migrations/0001_initial.py similarity index 100% rename from examples/json_editor_example/app/migrations/0001_initial.py rename to example/app/migrations/0001_initial.py diff --git a/examples/json_editor_example/app/migrations/__init__.py b/example/app/migrations/__init__.py similarity index 100% rename from examples/json_editor_example/app/migrations/__init__.py rename to example/app/migrations/__init__.py diff --git a/examples/json_editor_example/app/models.py b/example/app/models.py similarity index 100% rename from examples/json_editor_example/app/models.py rename to example/app/models.py diff --git a/examples/json_editor_example/example.png b/example/example.png similarity index 100% rename from examples/json_editor_example/example.png rename to example/example.png diff --git a/examples/json_editor_example/manage.py b/example/manage.py similarity index 100% rename from examples/json_editor_example/manage.py rename to example/manage.py diff --git a/examples/json_editor_example/project/__init__.py b/example/project/__init__.py similarity index 100% rename from examples/json_editor_example/project/__init__.py rename to example/project/__init__.py diff --git a/examples/json_editor_example/project/settings.py b/example/project/settings.py similarity index 98% rename from examples/json_editor_example/project/settings.py rename to example/project/settings.py index d7534fd..ca4de22 100644 --- a/examples/json_editor_example/project/settings.py +++ b/example/project/settings.py @@ -80,7 +80,7 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'json_editor_example', + 'NAME': 'django_admin_json_editor', } } diff --git a/example/project/urls.py b/example/project/urls.py new file mode 100644 index 0000000..ede2ec9 --- /dev/null +++ b/example/project/urls.py @@ -0,0 +1,6 @@ +from django.conf.urls import url +from django.contrib import admin + +urlpatterns = [ + url(r'^admin/', admin.site.urls), +] diff --git a/example/project/wsgi.py b/example/project/wsgi.py new file mode 100644 index 0000000..4c8ad75 --- /dev/null +++ b/example/project/wsgi.py @@ -0,0 +1,7 @@ +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings") + +application = get_wsgi_application() diff --git a/example/requirements.txt b/example/requirements.txt new file mode 100644 index 0000000..4478245 --- /dev/null +++ b/example/requirements.txt @@ -0,0 +1,2 @@ +.. +psycopg2==2.7.1 \ No newline at end of file diff --git a/example/venv/bin/activate b/example/venv/bin/activate new file mode 100644 index 0000000..d3f30f4 --- /dev/null +++ b/example/venv/bin/activate @@ -0,0 +1,76 @@ +# 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 + fi + + if [ -n "$_OLD_VIRTUAL_PS1" ] ; then + PS1="$_OLD_VIRTUAL_PS1" + export PS1 + unset _OLD_VIRTUAL_PS1 + fi + + unset VIRTUAL_ENV + if [ ! "$1" = "nondestructive" ] ; then + # Self destruct! + unset -f deactivate + fi +} + +# unset irrelevant variables +deactivate nondestructive + +VIRTUAL_ENV="/Users/abo/Projects/django-admin-json-editor/example/venv" +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" + if [ "x(venv) " != x ] ; then + PS1="(venv) $PS1" + else + if [ "`basename \"$VIRTUAL_ENV\"`" = "__" ] ; then + # special case for Aspen magic directories + # see http://www.zetadev.com/software/aspen/ + PS1="[`basename \`dirname \"$VIRTUAL_ENV\"\``] $PS1" + else + PS1="(`basename \"$VIRTUAL_ENV\"`)$PS1" + fi + fi + export PS1 +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 +fi diff --git a/example/venv/bin/activate.csh b/example/venv/bin/activate.csh new file mode 100644 index 0000000..211a0a9 --- /dev/null +++ b/example/venv/bin/activate.csh @@ -0,0 +1,37 @@ +# This file must be used with "source bin/activate.csh" *from csh*. +# You cannot run it directly. +# Created by Davide Di Blasi . +# Ported to Python 3.3 venv by Andrew Svetlov + +alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate' + +# Unset irrelevant variables. +deactivate nondestructive + +setenv VIRTUAL_ENV "/Users/abo/Projects/django-admin-json-editor/example/venv" + +set _OLD_VIRTUAL_PATH="$PATH" +setenv PATH "$VIRTUAL_ENV/bin:$PATH" + + +set _OLD_VIRTUAL_PROMPT="$prompt" + +if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then + if ("venv" != "") then + set env_name = "venv" + else + if (`basename "VIRTUAL_ENV"` == "__") then + # special case for Aspen magic directories + # see http://www.zetadev.com/software/aspen/ + set env_name = `basename \`dirname "$VIRTUAL_ENV"\`` + else + set env_name = `basename "$VIRTUAL_ENV"` + endif + endif + set prompt = "[$env_name] $prompt" + unset env_name +endif + +alias pydoc python -m pydoc + +rehash diff --git a/example/venv/bin/activate.fish b/example/venv/bin/activate.fish new file mode 100644 index 0000000..fe7328d --- /dev/null +++ b/example/venv/bin/activate.fish @@ -0,0 +1,75 @@ +# This file must be used with ". bin/activate.fish" *from fish* (http://fishshell.org) +# you cannot run it directly + +function deactivate -d "Exit virtualenv and return to normal shell environment" + # reset old environment variables + if test -n "$_OLD_VIRTUAL_PATH" + set -gx PATH $_OLD_VIRTUAL_PATH + set -e _OLD_VIRTUAL_PATH + end + if test -n "$_OLD_VIRTUAL_PYTHONHOME" + set -gx PYTHONHOME $_OLD_VIRTUAL_PYTHONHOME + set -e _OLD_VIRTUAL_PYTHONHOME + end + + if test -n "$_OLD_FISH_PROMPT_OVERRIDE" + functions -e fish_prompt + set -e _OLD_FISH_PROMPT_OVERRIDE + functions -c _old_fish_prompt fish_prompt + functions -e _old_fish_prompt + end + + set -e VIRTUAL_ENV + if test "$argv[1]" != "nondestructive" + # Self destruct! + functions -e deactivate + end +end + +# unset irrelevant variables +deactivate nondestructive + +set -gx VIRTUAL_ENV "/Users/abo/Projects/django-admin-json-editor/example/venv" + +set -gx _OLD_VIRTUAL_PATH $PATH +set -gx PATH "$VIRTUAL_ENV/bin" $PATH + +# unset PYTHONHOME if set +if set -q PYTHONHOME + set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME + set -e PYTHONHOME +end + +if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" + # fish uses a function instead of an env var to generate the prompt. + + # save the current fish_prompt function as the function _old_fish_prompt + functions -c fish_prompt _old_fish_prompt + + # with the original prompt function renamed, we can override with our own. + function fish_prompt + # Save the return status of the last command + set -l old_status $status + + # Prompt override? + if test -n "(venv) " + printf "%s%s" "(venv) " (set_color normal) + else + # ...Otherwise, prepend env + set -l _checkbase (basename "$VIRTUAL_ENV") + if test $_checkbase = "__" + # special case for Aspen magic directories + # see http://www.zetadev.com/software/aspen/ + printf "%s[%s]%s " (set_color -b blue white) (basename (dirname "$VIRTUAL_ENV")) (set_color normal) + else + printf "%s(%s)%s" (set_color -b blue white) (basename "$VIRTUAL_ENV") (set_color normal) + end + end + + # Restore the return status of the previous command. + echo "exit $old_status" | . + _old_fish_prompt + end + + set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV" +end diff --git a/example/venv/bin/django-admin b/example/venv/bin/django-admin new file mode 100755 index 0000000..47caa92 --- /dev/null +++ b/example/venv/bin/django-admin @@ -0,0 +1,11 @@ +#!/Users/abo/Projects/django-admin-json-editor/example/venv/bin/python3 + +# -*- coding: utf-8 -*- +import re +import sys + +from django.core.management import execute_from_command_line + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit(execute_from_command_line()) diff --git a/example/venv/bin/django-admin.py b/example/venv/bin/django-admin.py new file mode 100755 index 0000000..3b00cc9 --- /dev/null +++ b/example/venv/bin/django-admin.py @@ -0,0 +1,5 @@ +#!/Users/abo/Projects/django-admin-json-editor/example/venv/bin/python3 +from django.core import management + +if __name__ == "__main__": + management.execute_from_command_line() diff --git a/example/venv/bin/easy_install b/example/venv/bin/easy_install new file mode 100755 index 0000000..937d61d --- /dev/null +++ b/example/venv/bin/easy_install @@ -0,0 +1,11 @@ +#!/Users/abo/Projects/django-admin-json-editor/example/venv/bin/python3 + +# -*- coding: utf-8 -*- +import re +import sys + +from setuptools.command.easy_install import main + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/example/venv/bin/easy_install-3.6 b/example/venv/bin/easy_install-3.6 new file mode 100755 index 0000000..937d61d --- /dev/null +++ b/example/venv/bin/easy_install-3.6 @@ -0,0 +1,11 @@ +#!/Users/abo/Projects/django-admin-json-editor/example/venv/bin/python3 + +# -*- coding: utf-8 -*- +import re +import sys + +from setuptools.command.easy_install import main + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/example/venv/bin/pip b/example/venv/bin/pip new file mode 100755 index 0000000..7bea8e4 --- /dev/null +++ b/example/venv/bin/pip @@ -0,0 +1,11 @@ +#!/Users/abo/Projects/django-admin-json-editor/example/venv/bin/python3 + +# -*- coding: utf-8 -*- +import re +import sys + +from pip import main + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/example/venv/bin/pip3 b/example/venv/bin/pip3 new file mode 100755 index 0000000..7bea8e4 --- /dev/null +++ b/example/venv/bin/pip3 @@ -0,0 +1,11 @@ +#!/Users/abo/Projects/django-admin-json-editor/example/venv/bin/python3 + +# -*- coding: utf-8 -*- +import re +import sys + +from pip import main + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/example/venv/bin/pip3.6 b/example/venv/bin/pip3.6 new file mode 100755 index 0000000..7bea8e4 --- /dev/null +++ b/example/venv/bin/pip3.6 @@ -0,0 +1,11 @@ +#!/Users/abo/Projects/django-admin-json-editor/example/venv/bin/python3 + +# -*- coding: utf-8 -*- +import re +import sys + +from pip import main + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/example/venv/bin/python b/example/venv/bin/python new file mode 120000 index 0000000..b8a0adb --- /dev/null +++ b/example/venv/bin/python @@ -0,0 +1 @@ +python3 \ No newline at end of file diff --git a/example/venv/bin/python3 b/example/venv/bin/python3 new file mode 120000 index 0000000..79ab74b --- /dev/null +++ b/example/venv/bin/python3 @@ -0,0 +1 @@ +/usr/local/bin/python3 \ No newline at end of file diff --git a/example/venv/pip-selfcheck.json b/example/venv/pip-selfcheck.json new file mode 100644 index 0000000..1a5ca67 --- /dev/null +++ b/example/venv/pip-selfcheck.json @@ -0,0 +1 @@ +{"last_check":"2017-07-26T11:20:14Z","pypi_version":"9.0.1"} \ No newline at end of file diff --git a/example/venv/pyvenv.cfg b/example/venv/pyvenv.cfg new file mode 100644 index 0000000..28d2d31 --- /dev/null +++ b/example/venv/pyvenv.cfg @@ -0,0 +1,3 @@ +home = /usr/local/bin +include-system-site-packages = false +version = 3.6.1 diff --git a/examples/json_editor_example/.gitignore b/examples/json_editor_example/.gitignore deleted file mode 100644 index 2b85ff9..0000000 --- a/examples/json_editor_example/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -db.sqlite3 -env/ \ No newline at end of file diff --git a/examples/json_editor_example/project/urls.py b/examples/json_editor_example/project/urls.py deleted file mode 100644 index 5b8ec8c..0000000 --- a/examples/json_editor_example/project/urls.py +++ /dev/null @@ -1,21 +0,0 @@ -"""json_editor_example URL Configuration - -The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/1.11/topics/http/urls/ -Examples: -Function views - 1. Add an import: from my_app import views - 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') -Class-based views - 1. Add an import: from other_app.views import Home - 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') -Including another URLconf - 1. Import the include() function: from django.conf.urls import url, include - 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) -""" -from django.conf.urls import url -from django.contrib import admin - -urlpatterns = [ - url(r'^admin/', admin.site.urls), -] diff --git a/examples/json_editor_example/project/wsgi.py b/examples/json_editor_example/project/wsgi.py deleted file mode 100644 index 84dac96..0000000 --- a/examples/json_editor_example/project/wsgi.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -WSGI config for json_editor_example project. - -It exposes the WSGI callable as a module-level variable named ``application``. - -For more information on this file, see -https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ -""" - -import os - -from django.core.wsgi import get_wsgi_application - -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "json_editor_example.settings") - -application = get_wsgi_application() diff --git a/examples/json_editor_example/requirements.txt b/examples/json_editor_example/requirements.txt deleted file mode 100644 index 86c8572..0000000 --- a/examples/json_editor_example/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -psycopg2==2.7.1 -Django==1.11.2 -git+https://github.com/abogushov/django-admin-json-editor@0.1.0 \ No newline at end of file