diff options
author | 2019-04-05 18:24:32 +0100 | |
---|---|---|
committer | 2019-04-05 18:24:32 +0100 | |
commit | ab8b798547e82ca79882ba28b1920077c803425f (patch) | |
tree | b28a9005d05dfd2c9da62351671bf2aa6e37f7dc | |
parent | [#158 #160] Automatically run collectstatic in containers/setup script (diff) |
pysite -> pydis_site
-rw-r--r-- | .coveragerc | 14 | ||||
-rw-r--r-- | .dockerignore | 8 | ||||
-rw-r--r-- | .flake8 | 2 | ||||
-rw-r--r-- | azure-pipelines.yml | 4 | ||||
-rw-r--r-- | docker-compose.yml | 6 | ||||
-rw-r--r-- | docker/app/uwsgi.ini | 6 | ||||
-rw-r--r-- | docker/pysite.dockerapp | 2 | ||||
-rwxr-xr-x | manage.py | 2 | ||||
-rw-r--r-- | pydis_site/__init__.py (renamed from pysite/__init__.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/__init__.py (renamed from pysite/apps/__init__.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/admin/__init__.py (renamed from pysite/apps/admin/__init__.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/admin/urls.py (renamed from pysite/apps/admin/urls.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/__init__.py (renamed from pysite/apps/api/__init__.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/admin.py (renamed from pysite/apps/api/admin.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/apps.py (renamed from pysite/apps/api/apps.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0001_initial.py (renamed from pysite/apps/api/migrations/0001_initial.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0002_documentationlink.py (renamed from pysite/apps/api/migrations/0002_documentationlink.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0003_offtopicchannelname.py (renamed from pysite/apps/api/migrations/0003_offtopicchannelname.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0004_role.py (renamed from pysite/apps/api/migrations/0004_role.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0005_user.py (renamed from pysite/apps/api/migrations/0005_user.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0006_add_help_texts.py (renamed from pysite/apps/api/migrations/0006_add_help_texts.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0007_tag.py (renamed from pysite/apps/api/migrations/0007_tag.py) | 4 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0008_tag_embed_validator.py (renamed from pysite/apps/api/migrations/0008_tag_embed_validator.py) | 4 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0009_snakefact.py (renamed from pysite/apps/api/migrations/0009_snakefact.py) | 4 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0010_snakeidiom.py (renamed from pysite/apps/api/migrations/0010_snakeidiom.py) | 4 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0011_auto_20181020_1904.py (renamed from pysite/apps/api/migrations/0011_auto_20181020_1904.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0012_specialsnake.py (renamed from pysite/apps/api/migrations/0012_specialsnake.py) | 4 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0013_specialsnake_image.py (renamed from pysite/apps/api/migrations/0013_specialsnake_image.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0014_auto_20181025_1959.py (renamed from pysite/apps/api/migrations/0014_auto_20181025_1959.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0015_auto_20181027_1617.py (renamed from pysite/apps/api/migrations/0015_auto_20181027_1617.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0016_auto_20181027_1619.py (renamed from pysite/apps/api/migrations/0016_auto_20181027_1619.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0017_auto_20181029_1921.py (renamed from pysite/apps/api/migrations/0017_auto_20181029_1921.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0018_messagedeletioncontext.py (renamed from pysite/apps/api/migrations/0018_messagedeletioncontext.py) | 4 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0018_user_rename.py (renamed from pysite/apps/api/migrations/0018_user_rename.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0019_deletedmessage.py (renamed from pysite/apps/api/migrations/0019_deletedmessage.py) | 8 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0019_user_in_guild.py (renamed from pysite/apps/api/migrations/0019_user_in_guild.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0020_add_snake_field_validators.py (renamed from pysite/apps/api/migrations/0020_add_snake_field_validators.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0020_infraction.py (renamed from pysite/apps/api/migrations/0020_infraction.py) | 4 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0021_add_special_snake_validator.py (renamed from pysite/apps/api/migrations/0021_add_special_snake_validator.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0021_infraction_reason_null.py (renamed from pysite/apps/api/migrations/0021_infraction_reason_null.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0021_merge_20181125_1015.py (renamed from pysite/apps/api/migrations/0021_merge_20181125_1015.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0022_infraction_remove_note.py (renamed from pysite/apps/api/migrations/0022_infraction_remove_note.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0023_merge_infractions_snake_validators.py (renamed from pysite/apps/api/migrations/0023_merge_infractions_snake_validators.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0024_add_note_infraction_type.py (renamed from pysite/apps/api/migrations/0024_add_note_infraction_type.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0025_allow_custom_inserted_at_infraction_field.py (renamed from pysite/apps/api/migrations/0025_allow_custom_inserted_at_infraction_field.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0026_use_proper_default_for_infraction_insertion_date.py (renamed from pysite/apps/api/migrations/0026_use_proper_default_for_infraction_insertion_date.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0027_merge_20190120_0852.py (renamed from pysite/apps/api/migrations/0027_merge_20190120_0852.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0028_allow_message_content_blank.py (renamed from pysite/apps/api/migrations/0028_allow_message_content_blank.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0029_add_infraction_type_watch.py (renamed from pysite/apps/api/migrations/0029_add_infraction_type_watch.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0030_reminder.py (renamed from pysite/apps/api/migrations/0030_reminder.py) | 4 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0031_nomination.py (renamed from pysite/apps/api/migrations/0031_nomination.py) | 4 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0032_botsetting.py (renamed from pysite/apps/api/migrations/0032_botsetting.py) | 4 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0033_create_defcon_settings.py (renamed from pysite/apps/api/migrations/0033_create_defcon_settings.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/0034_add_botsetting_name_validator.py (renamed from pysite/apps/api/migrations/0034_add_botsetting_name_validator.py) | 4 | ||||
-rw-r--r-- | pydis_site/apps/api/migrations/__init__.py (renamed from pysite/apps/api/migrations/__init__.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/models.py (renamed from pysite/apps/api/models.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/serializers.py (renamed from pysite/apps/api/serializers.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/tests/__init__.py (renamed from pysite/apps/api/tests/__init__.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/tests/base.py (renamed from pysite/apps/api/tests/base.py) | 6 | ||||
-rw-r--r-- | pydis_site/apps/api/tests/test_deleted_messages.py (renamed from pysite/apps/api/tests/test_deleted_messages.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/tests/test_documentation_links.py (renamed from pysite/apps/api/tests/test_documentation_links.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/tests/test_healthcheck.py (renamed from pysite/apps/api/tests/test_healthcheck.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/tests/test_infractions.py (renamed from pysite/apps/api/tests/test_infractions.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/tests/test_models.py (renamed from pysite/apps/api/tests/test_models.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/tests/test_nominations.py (renamed from pysite/apps/api/tests/test_nominations.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/tests/test_off_topic_channel_names.py (renamed from pysite/apps/api/tests/test_off_topic_channel_names.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/tests/test_rules.py (renamed from pysite/apps/api/tests/test_rules.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/tests/test_snake_names.py (renamed from pysite/apps/api/tests/test_snake_names.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/tests/test_users.py (renamed from pysite/apps/api/tests/test_users.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/tests/test_validators.py (renamed from pysite/apps/api/tests/test_validators.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/urls.py (renamed from pysite/apps/api/urls.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/api/validators.py (renamed from pysite/apps/api/validators.py) | 2 | ||||
-rw-r--r-- | pydis_site/apps/api/views.py (renamed from pysite/apps/api/views.py) | 2 | ||||
-rw-r--r-- | pydis_site/apps/api/viewsets.py (renamed from pysite/apps/api/viewsets.py) | 8 | ||||
-rw-r--r-- | pydis_site/apps/home/__init__.py (renamed from pysite/apps/home/__init__.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/home/admin.py (renamed from pysite/apps/home/admin.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/home/apps.py (renamed from pysite/apps/home/apps.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/home/migrations/__init__.py (renamed from pysite/apps/home/migrations/__init__.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/home/models.py (renamed from pysite/apps/home/models.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/home/tests.py (renamed from pysite/apps/home/tests.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/home/urls.py (renamed from pysite/apps/home/urls.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/home/views.py (renamed from pysite/apps/home/views.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/wiki/__init__.py (renamed from pysite/apps/wiki/__init__.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/wiki/admin.py (renamed from pysite/apps/wiki/admin.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/wiki/apps.py (renamed from pysite/apps/wiki/apps.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/wiki/migrations/__init__.py (renamed from pysite/apps/wiki/migrations/__init__.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/wiki/models.py (renamed from pysite/apps/wiki/models.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/wiki/tests.py (renamed from pysite/apps/wiki/tests.py) | 0 | ||||
-rw-r--r-- | pydis_site/apps/wiki/views.py (renamed from pysite/apps/wiki/views.py) | 0 | ||||
-rw-r--r-- | pydis_site/hosts.py | 13 | ||||
-rw-r--r-- | pydis_site/settings.py (renamed from pysite/settings.py) | 18 | ||||
-rw-r--r-- | pydis_site/static/assets/logo-banner.png (renamed from pysite/static/assets/logo-banner.png) | bin | 34789 -> 34789 bytes | |||
-rw-r--r-- | pydis_site/static/assets/logo-banner.svg (renamed from pysite/static/assets/logo-banner.svg) | 0 | ||||
-rw-r--r-- | pydis_site/static/assets/logo-discord.png (renamed from pysite/static/assets/logo-discord.png) | bin | 63590 -> 63590 bytes | |||
-rw-r--r-- | pydis_site/static/css/navbar.css (renamed from pysite/static/css/navbar.css) | 0 | ||||
-rw-r--r-- | pydis_site/static/home/css/index.css (renamed from pysite/static/home/css/index.css) | 0 | ||||
-rw-r--r-- | pydis_site/templates/base.html (renamed from pysite/templates/base.html) | 0 | ||||
-rw-r--r-- | pydis_site/templates/home/index.html (renamed from pysite/templates/home/index.html) | 0 | ||||
-rw-r--r-- | pydis_site/templates/navbar.html (renamed from pysite/templates/navbar.html) | 0 | ||||
-rw-r--r-- | pydis_site/urls.py | 6 | ||||
-rw-r--r-- | pydis_site/wsgi.py (renamed from pysite/wsgi.py) | 4 | ||||
-rw-r--r-- | pysite/hosts.py | 13 | ||||
-rw-r--r-- | pysite/urls.py | 6 |
103 files changed, 87 insertions, 87 deletions
diff --git a/.coveragerc b/.coveragerc index ecdbc740..a2a51727 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,17 +1,17 @@ [run] branch = true source = - pysite - pysite/apps/admin - pysite/apps/api - pysite/apps/home - pysite/apps/wiki + pydis_site + pydis_site/apps/admin + pydis_site/apps/api + pydis_site/apps/home + pydis_site/apps/wiki omit = */admin.py */apps.py */urls.py - pysite/wsgi.py - pysite/settings.py + pydis_site/wsgi.py + pydis_site/settings.py [report] fail_under = 100 diff --git a/.dockerignore b/.dockerignore index ec42c3f4..ca6ba308 100644 --- a/.dockerignore +++ b/.dockerignore @@ -12,8 +12,8 @@ __pycache__ admin/tests admin/tests.py -pysite/apps/api/tests -pysite/apps/api/tests.py +pydis_site/apps/api/tests +pydis_site/apps/api/tests.py CHANGELOG.md CONTRIBUTING.md docker @@ -31,5 +31,5 @@ README.md scripts Vagrantfile venv -pysite/apps/wiki/tests -pysite/apps/wiki/tests.py +pydis_site/apps/wiki/tests +pydis_site/apps/wiki/tests.py @@ -1,6 +1,6 @@ [flake8] max-line-length=100 ignore=S106 -application_import_names=pysite +application_import_names=pydis_site exclude=__pycache__, venv, .venv, **/migrations import-order-style=pycharm diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e85608a1..1e6d67f0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -93,7 +93,7 @@ jobs: echo "CREATE DATABASE pysite OWNER pysite;" >> pgscript.sql sudo su postgres -c "psql < pgscript.sql" env: - USER_CREATE_COMMAND: CREATE USER pysite WITH PASSWORD 'pysite' CREATEDB + USER_CREATE_COMMAND: CREATE USER pydis_site WITH PASSWORD 'pydis_site' CREATEDB displayName: set up the database - script: python -m pip install pipenv && python -m pipenv install --dev --system @@ -104,7 +104,7 @@ jobs: coverage run --branch manage.py test --testrunner xmlrunner.extra.djangotestrunner.XMLTestRunner --no-input env: CI: azure - DATABASE_URL: postgres://pysite:pysite@localhost/pysite + DATABASE_URL: postgres://pydis_site:pydis_site@localhost/pydis_site displayName: run tests - script: coverage report diff --git a/docker-compose.yml b/docker-compose.yml index 1f101c0b..8519e763 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,9 +20,9 @@ services: postgres: image: postgres:11-alpine environment: - POSTGRES_DB: pysite + POSTGRES_DB: pydis_site POSTGRES_PASSWORD: supersecretpassword - POSTGRES_USER: pysite + POSTGRES_USER: pydis_site web: build: @@ -36,7 +36,7 @@ services: volumes: - .:/app:ro environment: - DATABASE_URL: postgres://pysite:supersecretpassword@postgres/pysite + DATABASE_URL: postgres://pydis_site:supersecretpassword@postgres/pydis_site DEBUG: "true" SECRET_KEY: suitable-for-development-only diff --git a/docker/app/uwsgi.ini b/docker/app/uwsgi.ini index 73014167..3f35258c 100644 --- a/docker/app/uwsgi.ini +++ b/docker/app/uwsgi.ini @@ -5,7 +5,7 @@ socket = :4000 ### File settings # WSGI application -wsgi = pysite.wsgi:application +wsgi = pydis_site.wsgi:application # Directory to move into at startup chdir = /app @@ -18,8 +18,8 @@ cheaper = 1 workers = 4 # Automatically set up meanginful process names auto-procname = true -# Prefix process names with `pysite : ` -procname-prefix-spaced = pysite : +# Prefix process names with `pydis_site : ` +procname-prefix-spaced = pydis_site : ### Worker options # Kill workers if they take more than 30 seconds to respond. diff --git a/docker/pysite.dockerapp b/docker/pysite.dockerapp index dc472b2e..738fcfdd 100644 --- a/docker/pysite.dockerapp +++ b/docker/pysite.dockerapp @@ -1,5 +1,5 @@ version: 0.3.0 -name: pysite +name: pydis_site description: | Our community website, built on Django and PostgreSQL. namespace: python-discord @@ -5,7 +5,7 @@ import sys # Separate definition to ease calling this in other scripts. def main(): - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pysite.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pydis_site.settings') try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/pysite/__init__.py b/pydis_site/__init__.py index e69de29b..e69de29b 100644 --- a/pysite/__init__.py +++ b/pydis_site/__init__.py diff --git a/pysite/apps/__init__.py b/pydis_site/apps/__init__.py index e69de29b..e69de29b 100644 --- a/pysite/apps/__init__.py +++ b/pydis_site/apps/__init__.py diff --git a/pysite/apps/admin/__init__.py b/pydis_site/apps/admin/__init__.py index e69de29b..e69de29b 100644 --- a/pysite/apps/admin/__init__.py +++ b/pydis_site/apps/admin/__init__.py diff --git a/pysite/apps/admin/urls.py b/pydis_site/apps/admin/urls.py index 146c6496..146c6496 100644 --- a/pysite/apps/admin/urls.py +++ b/pydis_site/apps/admin/urls.py diff --git a/pysite/apps/api/__init__.py b/pydis_site/apps/api/__init__.py index e69de29b..e69de29b 100644 --- a/pysite/apps/api/__init__.py +++ b/pydis_site/apps/api/__init__.py diff --git a/pysite/apps/api/admin.py b/pydis_site/apps/api/admin.py index 3ae7f3c5..3ae7f3c5 100644 --- a/pysite/apps/api/admin.py +++ b/pydis_site/apps/api/admin.py diff --git a/pysite/apps/api/apps.py b/pydis_site/apps/api/apps.py index d87006dd..d87006dd 100644 --- a/pysite/apps/api/apps.py +++ b/pydis_site/apps/api/apps.py diff --git a/pysite/apps/api/migrations/0001_initial.py b/pydis_site/apps/api/migrations/0001_initial.py index dca6d17f..dca6d17f 100644 --- a/pysite/apps/api/migrations/0001_initial.py +++ b/pydis_site/apps/api/migrations/0001_initial.py diff --git a/pysite/apps/api/migrations/0002_documentationlink.py b/pydis_site/apps/api/migrations/0002_documentationlink.py index 5dee679a..5dee679a 100644 --- a/pysite/apps/api/migrations/0002_documentationlink.py +++ b/pydis_site/apps/api/migrations/0002_documentationlink.py diff --git a/pysite/apps/api/migrations/0003_offtopicchannelname.py b/pydis_site/apps/api/migrations/0003_offtopicchannelname.py index 2f19bfd8..2f19bfd8 100644 --- a/pysite/apps/api/migrations/0003_offtopicchannelname.py +++ b/pydis_site/apps/api/migrations/0003_offtopicchannelname.py diff --git a/pysite/apps/api/migrations/0004_role.py b/pydis_site/apps/api/migrations/0004_role.py index 0a6b6c43..0a6b6c43 100644 --- a/pysite/apps/api/migrations/0004_role.py +++ b/pydis_site/apps/api/migrations/0004_role.py diff --git a/pysite/apps/api/migrations/0005_user.py b/pydis_site/apps/api/migrations/0005_user.py index a771119c..a771119c 100644 --- a/pysite/apps/api/migrations/0005_user.py +++ b/pydis_site/apps/api/migrations/0005_user.py diff --git a/pysite/apps/api/migrations/0006_add_help_texts.py b/pydis_site/apps/api/migrations/0006_add_help_texts.py index a57d2289..a57d2289 100644 --- a/pysite/apps/api/migrations/0006_add_help_texts.py +++ b/pydis_site/apps/api/migrations/0006_add_help_texts.py diff --git a/pysite/apps/api/migrations/0007_tag.py b/pydis_site/apps/api/migrations/0007_tag.py index d5546ccc..c22715f9 100644 --- a/pysite/apps/api/migrations/0007_tag.py +++ b/pydis_site/apps/api/migrations/0007_tag.py @@ -1,6 +1,6 @@ # Generated by Django 2.1.1 on 2018-09-21 22:05 -import pysite.apps.api.models +import pydis_site.apps.api.models import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -18,6 +18,6 @@ class Migration(migrations.Migration): ('title', models.CharField(help_text='The title of this tag, shown in searches and providing a quick overview over what this embed contains.', max_length=100, primary_key=True, serialize=False)), ('embed', django.contrib.postgres.fields.jsonb.JSONField(help_text='The actual embed shown by this tag.')), ], - bases=(pysite.apps.api.models.ModelReprMixin, models.Model), + bases=(pydis_site.apps.api.models.ModelReprMixin, models.Model), ), ] diff --git a/pysite/apps/api/migrations/0008_tag_embed_validator.py b/pydis_site/apps/api/migrations/0008_tag_embed_validator.py index fd2385d1..eecc0bc3 100644 --- a/pysite/apps/api/migrations/0008_tag_embed_validator.py +++ b/pydis_site/apps/api/migrations/0008_tag_embed_validator.py @@ -1,6 +1,6 @@ # Generated by Django 2.1.1 on 2018-09-23 10:07 -import pysite.apps.api.validators +import pydis_site.apps.api.validators import django.contrib.postgres.fields.jsonb from django.db import migrations @@ -18,6 +18,6 @@ class Migration(migrations.Migration): field=django.contrib.postgres.fields.jsonb.JSONField(help_text='The actual embed shown by this tag.', validators=[ - pysite.apps.api.validators.validate_tag_embed]), + pydis_site.apps.api.validators.validate_tag_embed]), ), ] diff --git a/pysite/apps/api/migrations/0009_snakefact.py b/pydis_site/apps/api/migrations/0009_snakefact.py index 2a136f83..4fc63bc9 100644 --- a/pysite/apps/api/migrations/0009_snakefact.py +++ b/pydis_site/apps/api/migrations/0009_snakefact.py @@ -1,6 +1,6 @@ # Generated by Django 2.1.2 on 2018-10-11 14:25 -import pysite.apps.api.models +import pydis_site.apps.api.models from django.db import migrations, models @@ -16,6 +16,6 @@ class Migration(migrations.Migration): fields=[ ('fact', models.CharField(help_text='A fact about snakes.', max_length=200, primary_key=True, serialize=False)), ], - bases=(pysite.apps.api.models.ModelReprMixin, models.Model), + bases=(pydis_site.apps.api.models.ModelReprMixin, models.Model), ), ] diff --git a/pysite/apps/api/migrations/0010_snakeidiom.py b/pydis_site/apps/api/migrations/0010_snakeidiom.py index 3eb99198..be089cf4 100644 --- a/pysite/apps/api/migrations/0010_snakeidiom.py +++ b/pydis_site/apps/api/migrations/0010_snakeidiom.py @@ -1,6 +1,6 @@ # Generated by Django 2.1.2 on 2018-10-19 16:27 -import pysite.apps.api.models +import pydis_site.apps.api.models from django.db import migrations, models @@ -16,6 +16,6 @@ class Migration(migrations.Migration): fields=[ ('idiom', models.CharField(help_text='A snake idiom', max_length=140, primary_key=True, serialize=False)), ], - bases=(pysite.apps.api.models.ModelReprMixin, models.Model), + bases=(pydis_site.apps.api.models.ModelReprMixin, models.Model), ), ] diff --git a/pysite/apps/api/migrations/0011_auto_20181020_1904.py b/pydis_site/apps/api/migrations/0011_auto_20181020_1904.py index bb5a6325..bb5a6325 100644 --- a/pysite/apps/api/migrations/0011_auto_20181020_1904.py +++ b/pydis_site/apps/api/migrations/0011_auto_20181020_1904.py diff --git a/pysite/apps/api/migrations/0012_specialsnake.py b/pydis_site/apps/api/migrations/0012_specialsnake.py index ecf1b9d9..77072526 100644 --- a/pysite/apps/api/migrations/0012_specialsnake.py +++ b/pydis_site/apps/api/migrations/0012_specialsnake.py @@ -1,6 +1,6 @@ # Generated by Django 2.1.2 on 2018-10-22 09:53 -import pysite.apps.api.models +import pydis_site.apps.api.models from django.db import migrations, models @@ -17,6 +17,6 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=140, primary_key=True, serialize=False)), ('info', models.TextField()), ], - bases=(pysite.apps.api.models.ModelReprMixin, models.Model), + bases=(pydis_site.apps.api.models.ModelReprMixin, models.Model), ), ] diff --git a/pysite/apps/api/migrations/0013_specialsnake_image.py b/pydis_site/apps/api/migrations/0013_specialsnake_image.py index a0d0d318..a0d0d318 100644 --- a/pysite/apps/api/migrations/0013_specialsnake_image.py +++ b/pydis_site/apps/api/migrations/0013_specialsnake_image.py diff --git a/pysite/apps/api/migrations/0014_auto_20181025_1959.py b/pydis_site/apps/api/migrations/0014_auto_20181025_1959.py index 3599d2cd..3599d2cd 100644 --- a/pysite/apps/api/migrations/0014_auto_20181025_1959.py +++ b/pydis_site/apps/api/migrations/0014_auto_20181025_1959.py diff --git a/pysite/apps/api/migrations/0015_auto_20181027_1617.py b/pydis_site/apps/api/migrations/0015_auto_20181027_1617.py index 8973ff6d..8973ff6d 100644 --- a/pysite/apps/api/migrations/0015_auto_20181027_1617.py +++ b/pydis_site/apps/api/migrations/0015_auto_20181027_1617.py diff --git a/pysite/apps/api/migrations/0016_auto_20181027_1619.py b/pydis_site/apps/api/migrations/0016_auto_20181027_1619.py index b8bdfb16..b8bdfb16 100644 --- a/pysite/apps/api/migrations/0016_auto_20181027_1619.py +++ b/pydis_site/apps/api/migrations/0016_auto_20181027_1619.py diff --git a/pysite/apps/api/migrations/0017_auto_20181029_1921.py b/pydis_site/apps/api/migrations/0017_auto_20181029_1921.py index 012bda61..012bda61 100644 --- a/pysite/apps/api/migrations/0017_auto_20181029_1921.py +++ b/pydis_site/apps/api/migrations/0017_auto_20181029_1921.py diff --git a/pysite/apps/api/migrations/0018_messagedeletioncontext.py b/pydis_site/apps/api/migrations/0018_messagedeletioncontext.py index 10428ceb..dced1288 100644 --- a/pysite/apps/api/migrations/0018_messagedeletioncontext.py +++ b/pydis_site/apps/api/migrations/0018_messagedeletioncontext.py @@ -1,6 +1,6 @@ # Generated by Django 2.1.1 on 2018-11-18 20:12 -import pysite.apps.api.models +import pydis_site.apps.api.models from django.db import migrations, models import django.db.models.deletion @@ -19,6 +19,6 @@ class Migration(migrations.Migration): ('creation', models.DateTimeField(help_text='When this deletion took place.')), ('actor', models.ForeignKey(help_text='The original actor causing this deletion. Could be the author of a manual clean command invocation, the bot when executing automatic actions, or nothing to indicate that the bulk deletion was not issued by us.', null=True, on_delete=django.db.models.deletion.CASCADE, to='api.User')), ], - bases=(pysite.apps.api.models.ModelReprMixin, models.Model), + bases=(pydis_site.apps.api.models.ModelReprMixin, models.Model), ), ] diff --git a/pysite/apps/api/migrations/0018_user_rename.py b/pydis_site/apps/api/migrations/0018_user_rename.py index f88eb5bc..f88eb5bc 100644 --- a/pysite/apps/api/migrations/0018_user_rename.py +++ b/pydis_site/apps/api/migrations/0018_user_rename.py diff --git a/pysite/apps/api/migrations/0019_deletedmessage.py b/pydis_site/apps/api/migrations/0019_deletedmessage.py index cb4c59f2..7a039675 100644 --- a/pysite/apps/api/migrations/0019_deletedmessage.py +++ b/pydis_site/apps/api/migrations/0019_deletedmessage.py @@ -1,7 +1,7 @@ # Generated by Django 2.1.1 on 2018-11-18 20:26 -import pysite.apps.api.models -import pysite.apps.api.validators +import pydis_site.apps.api.models +import pydis_site.apps.api.validators from django.db import migrations, models import django.db.models.deletion @@ -22,13 +22,13 @@ class Migration(migrations.Migration): ('embeds', django.contrib.postgres.fields.ArrayField(base_field=django.contrib.postgres.fields.jsonb.JSONField(validators=[ - pysite.apps.api.validators.validate_tag_embed]), help_text='Embeds attached to this message.', size=None)), + pydis_site.apps.api.validators.validate_tag_embed]), help_text='Embeds attached to this message.', size=None)), ('author', models.ForeignKey(help_text='The author of this message.', on_delete=django.db.models.deletion.CASCADE, to='api.User')), ('deletion_context', models.ForeignKey(help_text='The deletion context this message is part of.', on_delete=django.db.models.deletion.CASCADE, to='api.MessageDeletionContext')), ], options={ 'abstract': False, }, - bases=(pysite.apps.api.models.ModelReprMixin, models.Model), + bases=(pydis_site.apps.api.models.ModelReprMixin, models.Model), ), ] diff --git a/pysite/apps/api/migrations/0019_user_in_guild.py b/pydis_site/apps/api/migrations/0019_user_in_guild.py index fda008c4..fda008c4 100644 --- a/pysite/apps/api/migrations/0019_user_in_guild.py +++ b/pydis_site/apps/api/migrations/0019_user_in_guild.py diff --git a/pysite/apps/api/migrations/0020_add_snake_field_validators.py b/pydis_site/apps/api/migrations/0020_add_snake_field_validators.py index 3b625f9b..3b625f9b 100644 --- a/pysite/apps/api/migrations/0020_add_snake_field_validators.py +++ b/pydis_site/apps/api/migrations/0020_add_snake_field_validators.py diff --git a/pysite/apps/api/migrations/0020_infraction.py b/pydis_site/apps/api/migrations/0020_infraction.py index 7f7d5a41..6bef6b77 100644 --- a/pysite/apps/api/migrations/0020_infraction.py +++ b/pydis_site/apps/api/migrations/0020_infraction.py @@ -1,6 +1,6 @@ # Generated by Django 2.1.3 on 2018-11-19 22:02 -import pysite.apps.api.models +import pydis_site.apps.api.models from django.db import migrations, models import django.db.models.deletion @@ -25,6 +25,6 @@ class Migration(migrations.Migration): ('actor', models.ForeignKey(help_text='The user which applied the infraction.', on_delete=django.db.models.deletion.CASCADE, related_name='infractions_given', to='api.User')), ('user', models.ForeignKey(help_text='The user to which the infraction was applied.', on_delete=django.db.models.deletion.CASCADE, related_name='infractions_received', to='api.User')), ], - bases=(pysite.apps.api.models.ModelReprMixin, models.Model), + bases=(pydis_site.apps.api.models.ModelReprMixin, models.Model), ), ] diff --git a/pysite/apps/api/migrations/0021_add_special_snake_validator.py b/pydis_site/apps/api/migrations/0021_add_special_snake_validator.py index d41b96e5..d41b96e5 100644 --- a/pysite/apps/api/migrations/0021_add_special_snake_validator.py +++ b/pydis_site/apps/api/migrations/0021_add_special_snake_validator.py diff --git a/pysite/apps/api/migrations/0021_infraction_reason_null.py b/pydis_site/apps/api/migrations/0021_infraction_reason_null.py index 6600f230..6600f230 100644 --- a/pysite/apps/api/migrations/0021_infraction_reason_null.py +++ b/pydis_site/apps/api/migrations/0021_infraction_reason_null.py diff --git a/pysite/apps/api/migrations/0021_merge_20181125_1015.py b/pydis_site/apps/api/migrations/0021_merge_20181125_1015.py index d8eaa510..d8eaa510 100644 --- a/pysite/apps/api/migrations/0021_merge_20181125_1015.py +++ b/pydis_site/apps/api/migrations/0021_merge_20181125_1015.py diff --git a/pysite/apps/api/migrations/0022_infraction_remove_note.py b/pydis_site/apps/api/migrations/0022_infraction_remove_note.py index eba84610..eba84610 100644 --- a/pysite/apps/api/migrations/0022_infraction_remove_note.py +++ b/pydis_site/apps/api/migrations/0022_infraction_remove_note.py diff --git a/pysite/apps/api/migrations/0023_merge_infractions_snake_validators.py b/pydis_site/apps/api/migrations/0023_merge_infractions_snake_validators.py index 916f78f2..916f78f2 100644 --- a/pysite/apps/api/migrations/0023_merge_infractions_snake_validators.py +++ b/pydis_site/apps/api/migrations/0023_merge_infractions_snake_validators.py diff --git a/pysite/apps/api/migrations/0024_add_note_infraction_type.py b/pydis_site/apps/api/migrations/0024_add_note_infraction_type.py index 4adb53b8..4adb53b8 100644 --- a/pysite/apps/api/migrations/0024_add_note_infraction_type.py +++ b/pydis_site/apps/api/migrations/0024_add_note_infraction_type.py diff --git a/pysite/apps/api/migrations/0025_allow_custom_inserted_at_infraction_field.py b/pydis_site/apps/api/migrations/0025_allow_custom_inserted_at_infraction_field.py index 0c02cb91..0c02cb91 100644 --- a/pysite/apps/api/migrations/0025_allow_custom_inserted_at_infraction_field.py +++ b/pydis_site/apps/api/migrations/0025_allow_custom_inserted_at_infraction_field.py diff --git a/pysite/apps/api/migrations/0026_use_proper_default_for_infraction_insertion_date.py b/pydis_site/apps/api/migrations/0026_use_proper_default_for_infraction_insertion_date.py index 56f3b2b8..56f3b2b8 100644 --- a/pysite/apps/api/migrations/0026_use_proper_default_for_infraction_insertion_date.py +++ b/pydis_site/apps/api/migrations/0026_use_proper_default_for_infraction_insertion_date.py diff --git a/pysite/apps/api/migrations/0027_merge_20190120_0852.py b/pydis_site/apps/api/migrations/0027_merge_20190120_0852.py index 6fab4fd0..6fab4fd0 100644 --- a/pysite/apps/api/migrations/0027_merge_20190120_0852.py +++ b/pydis_site/apps/api/migrations/0027_merge_20190120_0852.py diff --git a/pysite/apps/api/migrations/0028_allow_message_content_blank.py b/pydis_site/apps/api/migrations/0028_allow_message_content_blank.py index 6d57db27..6d57db27 100644 --- a/pysite/apps/api/migrations/0028_allow_message_content_blank.py +++ b/pydis_site/apps/api/migrations/0028_allow_message_content_blank.py diff --git a/pysite/apps/api/migrations/0029_add_infraction_type_watch.py b/pydis_site/apps/api/migrations/0029_add_infraction_type_watch.py index c6f88a11..c6f88a11 100644 --- a/pysite/apps/api/migrations/0029_add_infraction_type_watch.py +++ b/pydis_site/apps/api/migrations/0029_add_infraction_type_watch.py diff --git a/pysite/apps/api/migrations/0030_reminder.py b/pydis_site/apps/api/migrations/0030_reminder.py index 8448ac8c..8c42f6dc 100644 --- a/pysite/apps/api/migrations/0030_reminder.py +++ b/pydis_site/apps/api/migrations/0030_reminder.py @@ -1,6 +1,6 @@ # Generated by Django 2.1.5 on 2019-01-22 22:17 -import pysite.apps.api.models +import pydis_site.apps.api.models from django.db import migrations, models import django.db.models.deletion @@ -22,6 +22,6 @@ class Migration(migrations.Migration): ('expiration', models.DateTimeField(help_text='When this reminder should be sent.')), ('author', models.ForeignKey(help_text='The creator of this reminder.', on_delete=django.db.models.deletion.CASCADE, to='api.User')), ], - bases=(pysite.apps.api.models.ModelReprMixin, models.Model), + bases=(pydis_site.apps.api.models.ModelReprMixin, models.Model), ), ] diff --git a/pysite/apps/api/migrations/0031_nomination.py b/pydis_site/apps/api/migrations/0031_nomination.py index f15da5c3..75e69701 100644 --- a/pysite/apps/api/migrations/0031_nomination.py +++ b/pydis_site/apps/api/migrations/0031_nomination.py @@ -1,6 +1,6 @@ # Generated by Django 2.1.5 on 2019-01-27 11:01 -import pysite.apps.api.models +import pydis_site.apps.api.models from django.db import migrations, models import django.db.models.deletion @@ -21,6 +21,6 @@ class Migration(migrations.Migration): ('inserted_at', models.DateTimeField(auto_now_add=True, help_text='The creation date of this nomination.')), ('author', models.ForeignKey(help_text='The staff member that nominated this user.', on_delete=django.db.models.deletion.CASCADE, related_name='nomination_set', to='api.User')), ], - bases=(pysite.apps.api.models.ModelReprMixin, models.Model), + bases=(pydis_site.apps.api.models.ModelReprMixin, models.Model), ), ] diff --git a/pysite/apps/api/migrations/0032_botsetting.py b/pydis_site/apps/api/migrations/0032_botsetting.py index b7916dff..25186a2b 100644 --- a/pysite/apps/api/migrations/0032_botsetting.py +++ b/pydis_site/apps/api/migrations/0032_botsetting.py @@ -1,6 +1,6 @@ # Generated by Django 2.1.5 on 2019-02-07 19:03 -import pysite.apps.api.models +import pydis_site.apps.api.models import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -18,6 +18,6 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=50, primary_key=True, serialize=False)), ('data', django.contrib.postgres.fields.jsonb.JSONField(help_text='The actual settings of this setting.')), ], - bases=(pysite.apps.api.models.ModelReprMixin, models.Model), + bases=(pydis_site.apps.api.models.ModelReprMixin, models.Model), ), ] diff --git a/pysite/apps/api/migrations/0033_create_defcon_settings.py b/pydis_site/apps/api/migrations/0033_create_defcon_settings.py index 830f3fb0..830f3fb0 100644 --- a/pysite/apps/api/migrations/0033_create_defcon_settings.py +++ b/pydis_site/apps/api/migrations/0033_create_defcon_settings.py diff --git a/pysite/apps/api/migrations/0034_add_botsetting_name_validator.py b/pydis_site/apps/api/migrations/0034_add_botsetting_name_validator.py index 79aee41e..bd370d8e 100644 --- a/pysite/apps/api/migrations/0034_add_botsetting_name_validator.py +++ b/pydis_site/apps/api/migrations/0034_add_botsetting_name_validator.py @@ -1,6 +1,6 @@ # Generated by Django 2.1.5 on 2019-02-18 19:41 -import pysite.apps.api.validators +import pydis_site.apps.api.validators from django.db import migrations, models @@ -15,6 +15,6 @@ class Migration(migrations.Migration): model_name='botsetting', name='name', field=models.CharField(max_length=50, primary_key=True, serialize=False, validators=[ - pysite.apps.api.validators.validate_bot_setting_name]), + pydis_site.apps.api.validators.validate_bot_setting_name]), ), ] diff --git a/pysite/apps/api/migrations/__init__.py b/pydis_site/apps/api/migrations/__init__.py index e69de29b..e69de29b 100644 --- a/pysite/apps/api/migrations/__init__.py +++ b/pydis_site/apps/api/migrations/__init__.py diff --git a/pysite/apps/api/models.py b/pydis_site/apps/api/models.py index 86c99f86..86c99f86 100644 --- a/pysite/apps/api/models.py +++ b/pydis_site/apps/api/models.py diff --git a/pysite/apps/api/serializers.py b/pydis_site/apps/api/serializers.py index 9a92313a..9a92313a 100644 --- a/pysite/apps/api/serializers.py +++ b/pydis_site/apps/api/serializers.py diff --git a/pysite/apps/api/tests/__init__.py b/pydis_site/apps/api/tests/__init__.py index e69de29b..e69de29b 100644 --- a/pysite/apps/api/tests/__init__.py +++ b/pydis_site/apps/api/tests/__init__.py diff --git a/pysite/apps/api/tests/base.py b/pydis_site/apps/api/tests/base.py index 61829d6f..0290fa69 100644 --- a/pysite/apps/api/tests/base.py +++ b/pydis_site/apps/api/tests/base.py @@ -28,7 +28,7 @@ class APISubdomainTestCase(APITestCase): If you don't want to force authentication (for example, to test a route's response for an unauthenticated user), un-force authentication by using the following: - >>> from pysite.apps.api import APISubdomainTestCase + >>> from pydis_site.apps.api import APISubdomainTestCase >>> class UnauthedUserTestCase(APISubdomainTestCase): ... def setUp(self): ... super().setUp() @@ -46,7 +46,7 @@ class APISubdomainTestCase(APITestCase): ## Example Using this in a test case is rather straightforward: - >>> from pysite.apps.api import APISubdomainTestCase + >>> from pydis_site.apps.api import APISubdomainTestCase >>> class MyAPITestCase(APISubdomainTestCase): ... def test_that_it_works(self): ... response = self.client.get('/my-endpoint') @@ -55,7 +55,7 @@ class APISubdomainTestCase(APITestCase): To reverse URLs of the API host, you need to use `django_hosts`: >>> from django_hosts.resolvers import reverse - >>> from pysite.apps.api import APISubdomainTestCase + >>> from pydis_site.apps.api import APISubdomainTestCase >>> class MyReversedTestCase(APISubdomainTestCase): ... def test_my_endpoint(self): ... url = reverse('user-detail', host='api') diff --git a/pysite/apps/api/tests/test_deleted_messages.py b/pydis_site/apps/api/tests/test_deleted_messages.py index cd5acab0..cd5acab0 100644 --- a/pysite/apps/api/tests/test_deleted_messages.py +++ b/pydis_site/apps/api/tests/test_deleted_messages.py diff --git a/pysite/apps/api/tests/test_documentation_links.py b/pydis_site/apps/api/tests/test_documentation_links.py index f6c78391..f6c78391 100644 --- a/pysite/apps/api/tests/test_documentation_links.py +++ b/pydis_site/apps/api/tests/test_documentation_links.py diff --git a/pysite/apps/api/tests/test_healthcheck.py b/pydis_site/apps/api/tests/test_healthcheck.py index b0fd71bf..b0fd71bf 100644 --- a/pysite/apps/api/tests/test_healthcheck.py +++ b/pydis_site/apps/api/tests/test_healthcheck.py diff --git a/pysite/apps/api/tests/test_infractions.py b/pydis_site/apps/api/tests/test_infractions.py index 7c370c17..7c370c17 100644 --- a/pysite/apps/api/tests/test_infractions.py +++ b/pydis_site/apps/api/tests/test_infractions.py diff --git a/pysite/apps/api/tests/test_models.py b/pydis_site/apps/api/tests/test_models.py index 43d1eb41..43d1eb41 100644 --- a/pysite/apps/api/tests/test_models.py +++ b/pydis_site/apps/api/tests/test_models.py diff --git a/pysite/apps/api/tests/test_nominations.py b/pydis_site/apps/api/tests/test_nominations.py index 1f03d1b0..1f03d1b0 100644 --- a/pysite/apps/api/tests/test_nominations.py +++ b/pydis_site/apps/api/tests/test_nominations.py diff --git a/pysite/apps/api/tests/test_off_topic_channel_names.py b/pydis_site/apps/api/tests/test_off_topic_channel_names.py index 60af1f62..60af1f62 100644 --- a/pysite/apps/api/tests/test_off_topic_channel_names.py +++ b/pydis_site/apps/api/tests/test_off_topic_channel_names.py diff --git a/pysite/apps/api/tests/test_rules.py b/pydis_site/apps/api/tests/test_rules.py index c94f89cc..c94f89cc 100644 --- a/pysite/apps/api/tests/test_rules.py +++ b/pydis_site/apps/api/tests/test_rules.py diff --git a/pysite/apps/api/tests/test_snake_names.py b/pydis_site/apps/api/tests/test_snake_names.py index 41dfae63..41dfae63 100644 --- a/pysite/apps/api/tests/test_snake_names.py +++ b/pydis_site/apps/api/tests/test_snake_names.py diff --git a/pysite/apps/api/tests/test_users.py b/pydis_site/apps/api/tests/test_users.py index 90bc3d30..90bc3d30 100644 --- a/pysite/apps/api/tests/test_users.py +++ b/pydis_site/apps/api/tests/test_users.py diff --git a/pysite/apps/api/tests/test_validators.py b/pydis_site/apps/api/tests/test_validators.py index d2c0a136..d2c0a136 100644 --- a/pysite/apps/api/tests/test_validators.py +++ b/pydis_site/apps/api/tests/test_validators.py diff --git a/pysite/apps/api/urls.py b/pydis_site/apps/api/urls.py index 6c89a52e..6c89a52e 100644 --- a/pysite/apps/api/urls.py +++ b/pydis_site/apps/api/urls.py diff --git a/pysite/apps/api/validators.py b/pydis_site/apps/api/validators.py index 5159cdb3..ac2fb739 100644 --- a/pysite/apps/api/validators.py +++ b/pydis_site/apps/api/validators.py @@ -86,7 +86,7 @@ def validate_tag_embed(embed): >>> from django.contrib.postgres import fields as pgfields >>> from django.db import models - >>> from pysite.apps.api import validate_tag_embed + >>> from pydis_site.apps.api import validate_tag_embed >>> class MyMessage(models.Model): ... embed = pgfields.JSONField( ... validators=( diff --git a/pysite/apps/api/views.py b/pydis_site/apps/api/views.py index f88e1039..3160e8f7 100644 --- a/pysite/apps/api/views.py +++ b/pydis_site/apps/api/views.py @@ -131,7 +131,7 @@ class RulesView(APIView): ), ( "We will not help you with anything that might break a law or the " - "terms of service of any other community, pysite, service, or " + "terms of service of any other community, pydis_site, service, or " "otherwise - No piracy, brute-forcing, captcha circumvention, " "sneaker bots, or anything else of that nature." ), diff --git a/pysite/apps/api/viewsets.py b/pydis_site/apps/api/viewsets.py index 0bd6149f..0471f79d 100644 --- a/pysite/apps/api/viewsets.py +++ b/pydis_site/apps/api/viewsets.py @@ -54,7 +54,7 @@ class DeletedMessageViewSet(CreateModelMixin, GenericViewSet): #### Body schema >>> { ... # The member ID of the original actor, if applicable. - ... # If a member ID is given, it must be present on the pysite. + ... # If a member ID is given, it must be present on the pydis_site. ... 'actor': Optional[int] ... 'creation': datetime, ... 'messages': [ @@ -192,7 +192,7 @@ class InfractionViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge ### POST /bot/infractions Create a new infraction and return the created infraction. Only `actor`, `type`, and `user` are required. - The `actor` and `user` must be users known by the pysite. + The `actor` and `user` must be users known by the pydis_site. #### Request body >>> { @@ -427,7 +427,7 @@ class ReminderViewSet(CreateModelMixin, ListModelMixin, DestroyModelMixin, Gener class RoleViewSet(ModelViewSet): """ View providing CRUD access to the roles on our server, used - by the bot to keep a mirror of our server's roles on the pysite. + by the bot to keep a mirror of our server's roles on the pydis_site. ## Routes ### GET /bot/roles @@ -802,7 +802,7 @@ class UserViewSet(BulkCreateModelMixin, ModelViewSet): ### POST /bot/users Adds a single or multiple new users. - The roles attached to the user(s) must be roles known by the pysite. + The roles attached to the user(s) must be roles known by the pydis_site. #### Request body >>> { diff --git a/pysite/apps/home/__init__.py b/pydis_site/apps/home/__init__.py index e69de29b..e69de29b 100644 --- a/pysite/apps/home/__init__.py +++ b/pydis_site/apps/home/__init__.py diff --git a/pysite/apps/home/admin.py b/pydis_site/apps/home/admin.py index 4185d360..4185d360 100644 --- a/pysite/apps/home/admin.py +++ b/pydis_site/apps/home/admin.py diff --git a/pysite/apps/home/apps.py b/pydis_site/apps/home/apps.py index 90dc7137..90dc7137 100644 --- a/pysite/apps/home/apps.py +++ b/pydis_site/apps/home/apps.py diff --git a/pysite/apps/home/migrations/__init__.py b/pydis_site/apps/home/migrations/__init__.py index e69de29b..e69de29b 100644 --- a/pysite/apps/home/migrations/__init__.py +++ b/pydis_site/apps/home/migrations/__init__.py diff --git a/pysite/apps/home/models.py b/pydis_site/apps/home/models.py index 0b4331b3..0b4331b3 100644 --- a/pysite/apps/home/models.py +++ b/pydis_site/apps/home/models.py diff --git a/pysite/apps/home/tests.py b/pydis_site/apps/home/tests.py index 54fac6e8..54fac6e8 100644 --- a/pysite/apps/home/tests.py +++ b/pydis_site/apps/home/tests.py diff --git a/pysite/apps/home/urls.py b/pydis_site/apps/home/urls.py index a01e019e..a01e019e 100644 --- a/pysite/apps/home/urls.py +++ b/pydis_site/apps/home/urls.py diff --git a/pysite/apps/home/views.py b/pydis_site/apps/home/views.py index fd0e0449..fd0e0449 100644 --- a/pysite/apps/home/views.py +++ b/pydis_site/apps/home/views.py diff --git a/pysite/apps/wiki/__init__.py b/pydis_site/apps/wiki/__init__.py index e69de29b..e69de29b 100644 --- a/pysite/apps/wiki/__init__.py +++ b/pydis_site/apps/wiki/__init__.py diff --git a/pysite/apps/wiki/admin.py b/pydis_site/apps/wiki/admin.py index 4185d360..4185d360 100644 --- a/pysite/apps/wiki/admin.py +++ b/pydis_site/apps/wiki/admin.py diff --git a/pysite/apps/wiki/apps.py b/pydis_site/apps/wiki/apps.py index fce4708e..fce4708e 100644 --- a/pysite/apps/wiki/apps.py +++ b/pydis_site/apps/wiki/apps.py diff --git a/pysite/apps/wiki/migrations/__init__.py b/pydis_site/apps/wiki/migrations/__init__.py index e69de29b..e69de29b 100644 --- a/pysite/apps/wiki/migrations/__init__.py +++ b/pydis_site/apps/wiki/migrations/__init__.py diff --git a/pysite/apps/wiki/models.py b/pydis_site/apps/wiki/models.py index 0b4331b3..0b4331b3 100644 --- a/pysite/apps/wiki/models.py +++ b/pydis_site/apps/wiki/models.py diff --git a/pysite/apps/wiki/tests.py b/pydis_site/apps/wiki/tests.py index a79ca8be..a79ca8be 100644 --- a/pysite/apps/wiki/tests.py +++ b/pydis_site/apps/wiki/tests.py diff --git a/pysite/apps/wiki/views.py b/pydis_site/apps/wiki/views.py index fd0e0449..fd0e0449 100644 --- a/pysite/apps/wiki/views.py +++ b/pydis_site/apps/wiki/views.py diff --git a/pydis_site/hosts.py b/pydis_site/hosts.py new file mode 100644 index 00000000..86375173 --- /dev/null +++ b/pydis_site/hosts.py @@ -0,0 +1,13 @@ +from django.conf import settings +from django_hosts import host, patterns + +host_patterns = patterns( + '', + # > | Subdomain | URL Module | Host entry name | + host(r'admin', 'pydis_site.apps.admin.urls', name="admin"), + host(r'api', 'pydis_site.apps.api.urls', name='api'), + # host(r"staff", "pydis_site.apps.staff", name="staff"), + # host(r"wiki", "pydis_site.apps.wiki", name="wiki"), + # host(r"ws", "pydis_site.apps. ws", name="ws"), + host(r'.*', 'pydis_site.apps.home.urls', name=settings.DEFAULT_HOST) +) diff --git a/pysite/settings.py b/pydis_site/settings.py index 4bcc27b4..e8355918 100644 --- a/pysite/settings.py +++ b/pydis_site/settings.py @@ -1,5 +1,5 @@ """ -Django settings for pysite project. +Django settings for pydis_site project. Generated by 'django-admin startproject' using Django 2.1. @@ -62,9 +62,9 @@ else: # Application definition INSTALLED_APPS = [ - 'pysite.apps.api', - 'pysite.apps.home', - 'pysite.apps.wiki', + 'pydis_site.apps.api', + 'pydis_site.apps.home', + 'pydis_site.apps.wiki', 'django.contrib.admin', 'django.contrib.auth', @@ -95,12 +95,12 @@ MIDDLEWARE = [ 'django_hosts.middleware.HostsResponseMiddleware', ] -ROOT_URLCONF = 'pysite.urls' +ROOT_URLCONF = 'pydis_site.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [os.path.join(BASE_DIR, 'pysite', 'templates')], + 'DIRS': [os.path.join(BASE_DIR, 'pydis_site', 'templates')], 'APP_DIRS': True, 'OPTIONS': { 'builtins': [ @@ -117,7 +117,7 @@ TEMPLATES = [ }, ] -WSGI_APPLICATION = 'pysite.wsgi.application' +WSGI_APPLICATION = 'pydis_site.wsgi.application' # Database @@ -165,7 +165,7 @@ USE_TZ = True # https://docs.djangoproject.com/en/2.1/howto/static-files/ STATIC_URL = '/static/' -STATICFILES_DIRS = [os.path.join(BASE_DIR, 'pysite', 'static')] +STATICFILES_DIRS = [os.path.join(BASE_DIR, 'pydis_site', 'static')] STATIC_ROOT = env('STATIC_ROOT', default='staticfiles') STATICFILES_FINDERS = [ @@ -177,7 +177,7 @@ STATICFILES_FINDERS = [ # django-hosts # https://django-hosts.readthedocs.io/en/latest/ -ROOT_HOSTCONF = 'pysite.hosts' +ROOT_HOSTCONF = 'pydis_site.hosts' DEFAULT_HOST = 'home' if DEBUG: diff --git a/pysite/static/assets/logo-banner.png b/pydis_site/static/assets/logo-banner.png Binary files differindex 89aa9b5a..89aa9b5a 100644 --- a/pysite/static/assets/logo-banner.png +++ b/pydis_site/static/assets/logo-banner.png diff --git a/pysite/static/assets/logo-banner.svg b/pydis_site/static/assets/logo-banner.svg index ac04d699..ac04d699 100644 --- a/pysite/static/assets/logo-banner.svg +++ b/pydis_site/static/assets/logo-banner.svg diff --git a/pysite/static/assets/logo-discord.png b/pydis_site/static/assets/logo-discord.png Binary files differindex 2bf74ffd..2bf74ffd 100644 --- a/pysite/static/assets/logo-discord.png +++ b/pydis_site/static/assets/logo-discord.png diff --git a/pysite/static/css/navbar.css b/pydis_site/static/css/navbar.css index db4b85e7..db4b85e7 100644 --- a/pysite/static/css/navbar.css +++ b/pydis_site/static/css/navbar.css diff --git a/pysite/static/home/css/index.css b/pydis_site/static/home/css/index.css index 76653320..76653320 100644 --- a/pysite/static/home/css/index.css +++ b/pydis_site/static/home/css/index.css diff --git a/pysite/templates/base.html b/pydis_site/templates/base.html index 1dcdfdc4..1dcdfdc4 100644 --- a/pysite/templates/base.html +++ b/pydis_site/templates/base.html diff --git a/pysite/templates/home/index.html b/pydis_site/templates/home/index.html index cc99763b..cc99763b 100644 --- a/pysite/templates/home/index.html +++ b/pydis_site/templates/home/index.html diff --git a/pysite/templates/navbar.html b/pydis_site/templates/navbar.html index 0efa51c2..0efa51c2 100644 --- a/pysite/templates/navbar.html +++ b/pydis_site/templates/navbar.html diff --git a/pydis_site/urls.py b/pydis_site/urls.py new file mode 100644 index 00000000..c68375da --- /dev/null +++ b/pydis_site/urls.py @@ -0,0 +1,6 @@ +from django.urls import include, path + + +urlpatterns = ( + path('', include('pydis_site.apps.home.urls', namespace='home')), +) diff --git a/pysite/wsgi.py b/pydis_site/wsgi.py index 0a7ca6bd..853e56f1 100644 --- a/pysite/wsgi.py +++ b/pydis_site/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for pysite project. +WSGI config for pydis_site project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pysite.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pydis_site.settings') application = get_wsgi_application() diff --git a/pysite/hosts.py b/pysite/hosts.py deleted file mode 100644 index bb8f867d..00000000 --- a/pysite/hosts.py +++ /dev/null @@ -1,13 +0,0 @@ -from django.conf import settings -from django_hosts import host, patterns - -host_patterns = patterns( - '', - # > | Subdomain | URL Module | Host entry name | - host(r'admin', 'pysite.apps.admin.urls', name="admin"), - host(r'api', 'pysite.apps.api.urls', name='api'), - # host(r"staff", "pysite.apps.staff", name="staff"), - # host(r"wiki", "pysite.apps.wiki", name="wiki"), - # host(r"ws", "pysite.apps. ws", name="ws"), - host(r'.*', 'pysite.apps.home.urls', name=settings.DEFAULT_HOST) -) diff --git a/pysite/urls.py b/pysite/urls.py deleted file mode 100644 index 25ce2106..00000000 --- a/pysite/urls.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.urls import include, path - - -urlpatterns = ( - path('', include('pysite.apps.home.urls', namespace='home')), -) |