cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-08-02 03:00:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

almost final changes

Browse Source
This commit is contained in:
Krzysztof Szumny 2015-08-19 16:11:35 +02:00
parent 672f37ed08
commit 103e173994
11 changed files with 57 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hooks/post_gen_project.py
View File

@ -44,3 +44,17 @@ if not pycharm:
shutil.rmtree(os.path.join(project_directory, path)) shutil.rmtree(os.path.join(project_directory, path))
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
import fileinput
jdk_table_xml = os.path.join(project_directory, 'compose/pycharm/jdk.table.xml')
jdk_table_dst_dir = os.path.join(os.path.expanduser('~'), '.PyCharm40/config/options/')
for line in fileinput.input(jdk_table_xml, inplace=True):
print line.replace('$PROJECT_DIR$', project_directory),
if not os.path.exists(jdk_table_dst_dir):
os.makedirs(jdk_table_dst_dir)
shutil.copy2(jdk_table_xml, jdk_table_dst_dir)

8
{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__createsuperuser.xml → {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__createsuperuser.xml
View File

@ -1,17 +1,17 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="[edit to activate] Docker: createsuperuser" type="Python.DjangoServer" factoryName="Django server" singleton="true"> <configuration default="false" name="Docker: createsuperuser" type="Python.DjangoServer" factoryName="Django server" singleton="true">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
<envs> <envs>
<env name="PYTHONUNBUFFERED" value="1" /> <env name="PYTHONUNBUFFERED" value="1" />
<env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" /> <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
</envs> </envs>
<option name="SDK_HOME" value="ssh://docker@localhost:2222/usr/local/bin/python" /> <option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="false" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<module name="coco_repo" /> <module name="{{ cookiecutter.repo_name }}" />
<PathMappingSettings> <PathMappingSettings>
<option name="pathMappings"> <option name="pathMappings">
<list> <list>

6
{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__migrate.xml → {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml
View File

@ -1,17 +1,17 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="[edit to activate] Docker: migrate" type="Python.DjangoServer" factoryName="Django server" singleton="true"> <configuration default="false" name="Docker: migrate" type="Python.DjangoServer" factoryName="Django server" singleton="true">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
<envs> <envs>
<env name="PYTHONUNBUFFERED" value="1" /> <env name="PYTHONUNBUFFERED" value="1" />
<env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" /> <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
</envs> </envs>
<option name="SDK_HOME" value="ssh://docker@localhost:2222/usr/local/bin/python" /> <option name="SDK_HOME" value="sftp://docker@localhost:2222/usr/local/bin/python" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="false" /> <option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<module name="coco_repo" /> <module name="{{ cookiecutter.repo_name }}" />
<PathMappingSettings> <PathMappingSettings>
<option name="pathMappings"> <option name="pathMappings">
<list> <list>

6
{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__runserver.xml → {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver.xml
View File

@ -1,17 +1,17 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="[edit to activate] Docker: runserver" type="Python.DjangoServer" factoryName="Django server" singleton="true"> <configuration default="false" name="Docker: runserver" type="Python.DjangoServer" factoryName="Django server" singleton="true">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
<envs> <envs>
<env name="PYTHONUNBUFFERED" value="1" /> <env name="PYTHONUNBUFFERED" value="1" />
<env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" /> <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
</envs> </envs>
<option name="SDK_HOME" value="ssh://docker@localhost:2222/usr/local/bin/python" /> <option name="SDK_HOME" value="sftp://docker@localhost:2222/usr/local/bin/python" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="false" /> <option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<module name="coco_repo" /> <module name="{{ cookiecutter.repo_name }}" />
<PathMappingSettings> <PathMappingSettings>
<option name="pathMappings"> <option name="pathMappings">
<list> <list>

6
{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__runserver_plus.xml → {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml
View File

@ -1,17 +1,17 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="[edit to activate] Docker: runserver_plus" type="Python.DjangoServer" factoryName="Django server" singleton="true"> <configuration default="false" name="Docker: runserver_plus" type="Python.DjangoServer" factoryName="Django server" singleton="true">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
<envs> <envs>
<env name="PYTHONUNBUFFERED" value="1" /> <env name="PYTHONUNBUFFERED" value="1" />
<env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" /> <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
</envs> </envs>
<option name="SDK_HOME" value="ssh://docker@localhost:2222/usr/local/bin/python" /> <option name="SDK_HOME" value="sftp://docker@localhost:2222/usr/local/bin/python" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="false" /> <option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<module name="coco_repo" /> <module name="{{ cookiecutter.repo_name }}" />
<PathMappingSettings> <PathMappingSettings>
<option name="pathMappings"> <option name="pathMappings">
<list> <list>

6
{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__tests___all.xml → {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml
View File

@ -1,17 +1,17 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="[edit to activate] Docker: tests - all" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true"> <configuration default="false" name="Docker: tests - all" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
<envs> <envs>
<env name="PYTHONUNBUFFERED" value="1" /> <env name="PYTHONUNBUFFERED" value="1" />
<env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" /> <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
</envs> </envs>
<option name="SDK_HOME" value="ssh://docker@localhost:2222/usr/local/bin/python" /> <option name="SDK_HOME" value="sftp://docker@localhost:2222/usr/local/bin/python" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="false" /> <option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<module name="coco_repo" /> <module name="{{ cookiecutter.repo_name }}" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" /> <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
<PathMappingSettings> <PathMappingSettings>
<option name="pathMappings"> <option name="pathMappings">

10
{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__tests___users.xml → {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___users.xml
View File

@ -1,17 +1,17 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="[edit to activate] Docker: tests - users" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true"> <configuration default="false" name="Docker: tests - users" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
<envs> <envs>
<env name="PYTHONUNBUFFERED" value="1" /> <env name="PYTHONUNBUFFERED" value="1" />
<env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" /> <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
</envs> </envs>
<option name="SDK_HOME" value="ssh://docker@localhost:2222/usr/local/bin/python" /> <option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="false" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<module name="coco_repo" /> <module name="{{ cookiecutter.repo_name }}" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" /> <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
<PathMappingSettings> <PathMappingSettings>
<option name="pathMappings"> <option name="pathMappings">
@ -20,7 +20,7 @@
</list> </list>
</option> </option>
</PathMappingSettings> </PathMappingSettings>
<option name="TARGET" value=" wawel_repo.users" /> <option name="TARGET" value="{{ cookiecutter.repo_name }}.users" />
<option name="SETTINGS_FILE" value="" /> <option name="SETTINGS_FILE" value="" />
<option name="CUSTOM_SETTINGS" value="false" /> <option name="CUSTOM_SETTINGS" value="false" />
<option name="USE_OPTIONS" value="false" /> <option name="USE_OPTIONS" value="false" />

2
{{cookiecutter.repo_name}}/.idea/{{cookiecutter.repo_name}}.iml
View File

@ -12,7 +12,7 @@
</component> </component>
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" /> <content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" /> <orderEntry type="jdk" jdkName="Remote Python 2.7.9 (sftp://docker@localhost:2222/usr/local/bin/python)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
<component name="TemplatesService"> <component name="TemplatesService">

7
{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
View File

@ -22,17 +22,14 @@ fi
useradd $useraddOptions $user useradd $useraddOptions $user
ln -s /pycharm_helpers/ /home/$user/.pycharm_helpers
chown -R $user:$user /pycharm_helpers/
mkdir /home/$user/.ssh mkdir /home/$user/.ssh
cat /ssh_id_rsa.pub > /home/$user/.ssh/authorized_keys cat /ssh_id_rsa.pub > /home/$user/.ssh/authorized_keys
chown $user:$user /home/$user chown $user:$user /home/$user
chmod 755 /home/$user chmod 755 /home/$user
chmod 700 /home/$user/.ssh chmod 700 /home/$user/.ssh
700 /home/docker/.ssh chmod 700 /home/docker/.ssh
600 /home/docker/.ssh/authorized_keys chmod 600 /home/docker/.ssh/authorized_keys
chown -R $user:$user /home/$user/ chown -R $user:$user /home/$user/

19
{{cookiecutter.repo_name}}/compose/pycharm/jdk.table.xml Normal file
View File

@ -0,0 +1,19 @@
<application>
<component name="ProjectJdkTable">
<jdk version="2">
<name value="Remote Python 2.7.9 (ssh://docker@localhost:2222/usr/local/bin/python)" />
<type value="Python SDK" />
<homePath value="ssh://docker@localhost:2222/usr/local/bin/python" />
<roots>
<classPath>
<root type="composite" />
</classPath>
<sourcePath>
<root type="composite" />
</sourcePath>
</roots>
<additional HOST="localhost" PORT="2222" ANONYMOUS="false" USERNAME="docker" PASSWORD="" PRIVATE_KEY_FILE="$PROJECT_DIR$/compose/pycharm/.ssh_keys_to_docker/id_rsa" MY_KNOWN_HOSTS_FILE="" PASSPHRASE="" USE_KEY_PAIR="true" INTERPRETER_PATH="/usr/local/bin/python" HELPERS_PATH="/home/docker/.pycharm_helpers/" INITIALIZED="false" VALID="true" SKELETONS_PATH="" />
</jdk>
</component>
</application>

7
{{cookiecutter.repo_name}}/debug.yml
View File

@ -13,15 +13,8 @@ debug:
- "2222:22" - "2222:22"
volumes: volumes:
- .:/app - .:/app
volumes_from:
- pycharmhelpers
environment: environment:
SFTP_USER: docker SFTP_USER: docker
SFTP_PASS: docker SFTP_PASS: docker
links: links:
- postgres - postgres
pycharmhelpers:
image: pcdocker/pycharm_helpers
volumes:
- /pycharm_helpers