diff --git a/.vscode/settings.json b/.vscode/settings.json index 5d94cac..988937c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "python.pythonPath": "/Users/jb/.local/share/virtualenvs/api-cP68AE47/bin/python" + "python.pythonPath": "/usr/local/bin/python3" } \ No newline at end of file diff --git a/Pipfile b/Pipfile index 967df83..05e36fa 100644 --- a/Pipfile +++ b/Pipfile @@ -4,6 +4,7 @@ url = "https://pypi.org/simple" verify_ssl = true [dev-packages] +pylint = "*" [packages] django = "*" diff --git a/Pipfile.lock b/Pipfile.lock index fa093d1..c1a0239 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "627ef89f247ecee27e9ef0dabe116108d09c47abf171c900a8817befa64f9dd2" + "sha256": "f600080648764af8a3daecdd0575cad7ac2e05698caab220a57026a163729994" }, "pipfile-spec": 6, "requires": { @@ -39,5 +39,93 @@ "version": "==0.3.0" } }, - "develop": {} + "develop": { + "astroid": { + "hashes": [ + "sha256:6560e1e1749f68c64a4b5dee4e091fce798d2f0d84ebe638cf0e0585a343acf4", + "sha256:b65db1bbaac9f9f4d190199bb8680af6f6f84fd3769a5ea883df8a91fe68b4c4" + ], + "version": "==2.2.5" + }, + "isort": { + "hashes": [ + "sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1", + "sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd" + ], + "version": "==4.3.21" + }, + "lazy-object-proxy": { + "hashes": [ + "sha256:159a745e61422217881c4de71f9eafd9d703b93af95618635849fe469a283661", + "sha256:23f63c0821cc96a23332e45dfaa83266feff8adc72b9bcaef86c202af765244f", + "sha256:3b11be575475db2e8a6e11215f5aa95b9ec14de658628776e10d96fa0b4dac13", + "sha256:3f447aff8bc61ca8b42b73304f6a44fa0d915487de144652816f950a3f1ab821", + "sha256:4ba73f6089cd9b9478bc0a4fa807b47dbdb8fad1d8f31a0f0a5dbf26a4527a71", + "sha256:4f53eadd9932055eac465bd3ca1bd610e4d7141e1278012bd1f28646aebc1d0e", + "sha256:64483bd7154580158ea90de5b8e5e6fc29a16a9b4db24f10193f0c1ae3f9d1ea", + "sha256:6f72d42b0d04bfee2397aa1862262654b56922c20a9bb66bb76b6f0e5e4f9229", + "sha256:7c7f1ec07b227bdc561299fa2328e85000f90179a2f44ea30579d38e037cb3d4", + "sha256:7c8b1ba1e15c10b13cad4171cfa77f5bb5ec2580abc5a353907780805ebe158e", + "sha256:8559b94b823f85342e10d3d9ca4ba5478168e1ac5658a8a2f18c991ba9c52c20", + "sha256:a262c7dfb046f00e12a2bdd1bafaed2408114a89ac414b0af8755c696eb3fc16", + "sha256:acce4e3267610c4fdb6632b3886fe3f2f7dd641158a843cf6b6a68e4ce81477b", + "sha256:be089bb6b83fac7f29d357b2dc4cf2b8eb8d98fe9d9ff89f9ea6012970a853c7", + "sha256:bfab710d859c779f273cc48fb86af38d6e9210f38287df0069a63e40b45a2f5c", + "sha256:c10d29019927301d524a22ced72706380de7cfc50f767217485a912b4c8bd82a", + "sha256:dd6e2b598849b3d7aee2295ac765a578879830fb8966f70be8cd472e6069932e", + "sha256:e408f1eacc0a68fed0c08da45f31d0ebb38079f043328dce69ff133b95c29dc1" + ], + "version": "==1.4.1" + }, + "mccabe": { + "hashes": [ + "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", + "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f" + ], + "version": "==0.6.1" + }, + "pylint": { + "hashes": [ + "sha256:5d77031694a5fb97ea95e828c8d10fc770a1df6eb3906067aaed42201a8a6a09", + "sha256:723e3db49555abaf9bf79dc474c6b9e2935ad82230b10c1138a71ea41ac0fff1" + ], + "index": "pypi", + "version": "==2.3.1" + }, + "six": { + "hashes": [ + "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", + "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" + ], + "version": "==1.12.0" + }, + "typed-ast": { + "hashes": [ + "sha256:18511a0b3e7922276346bcb47e2ef9f38fb90fd31cb9223eed42c85d1312344e", + "sha256:262c247a82d005e43b5b7f69aff746370538e176131c32dda9cb0f324d27141e", + "sha256:2b907eb046d049bcd9892e3076c7a6456c93a25bebfe554e931620c90e6a25b0", + "sha256:354c16e5babd09f5cb0ee000d54cfa38401d8b8891eefa878ac772f827181a3c", + "sha256:4e0b70c6fc4d010f8107726af5fd37921b666f5b31d9331f0bd24ad9a088e631", + "sha256:630968c5cdee51a11c05a30453f8cd65e0cc1d2ad0d9192819df9978984529f4", + "sha256:66480f95b8167c9c5c5c87f32cf437d585937970f3fc24386f313a4c97b44e34", + "sha256:71211d26ffd12d63a83e079ff258ac9d56a1376a25bc80b1cdcdf601b855b90b", + "sha256:95bd11af7eafc16e829af2d3df510cecfd4387f6453355188342c3e79a2ec87a", + "sha256:bc6c7d3fa1325a0c6613512a093bc2a2a15aeec350451cbdf9e1d4bffe3e3233", + "sha256:cc34a6f5b426748a507dd5d1de4c1978f2eb5626d51326e43280941206c209e1", + "sha256:d755f03c1e4a51e9b24d899561fec4ccaf51f210d52abdf8c07ee2849b212a36", + "sha256:d7c45933b1bdfaf9f36c579671fec15d25b06c8398f113dab64c18ed1adda01d", + "sha256:d896919306dd0aa22d0132f62a1b78d11aaf4c9fc5b3410d3c666b818191630a", + "sha256:ffde2fbfad571af120fcbfbbc61c72469e72f550d676c3342492a9dfdefb8f12" + ], + "markers": "implementation_name == 'cpython'", + "version": "==1.4.0" + }, + "wrapt": { + "hashes": [ + "sha256:3ab60da600be94b45f34362f4000838cddff068880b7bed24f8ea240f63f9b62", + "sha256:565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1" + ], + "version": "==1.11.2" + } + } } diff --git a/mercedes/__init__.py b/mercedes/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/mercedes/admin.py b/mercedes/admin.py new file mode 100644 index 0000000..69d0367 --- /dev/null +++ b/mercedes/admin.py @@ -0,0 +1,4 @@ +from django.contrib import admin +from .models import Mercedes +# Register your models here. +admin.site.register(Mercedes) \ No newline at end of file diff --git a/mercedes/apps.py b/mercedes/apps.py new file mode 100644 index 0000000..48679bc --- /dev/null +++ b/mercedes/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class MercedesConfig(AppConfig): + name = 'mercedes' diff --git a/mercedes/migrations/0001_initial.py b/mercedes/migrations/0001_initial.py new file mode 100644 index 0000000..4158422 --- /dev/null +++ b/mercedes/migrations/0001_initial.py @@ -0,0 +1,27 @@ +# Generated by Django 2.2.4 on 2019-08-15 22:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Mercedes', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=256)), + ('quote', models.CharField(max_length=1024)), + ('personal_item', models.CharField(max_length=256)), + ('carry_on', models.CharField(max_length=256)), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/mercedes/migrations/0002_auto_20190815_2238.py b/mercedes/migrations/0002_auto_20190815_2238.py new file mode 100644 index 0000000..3995960 --- /dev/null +++ b/mercedes/migrations/0002_auto_20190815_2238.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.4 on 2019-08-15 22:38 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('mercedes', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='mercedes', + name='personal_item', + field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.SET_DEFAULT, related_name='personal_item', to='passengers.CarryOn'), + ), + ] diff --git a/mercedes/migrations/0003_auto_20190815_2238.py b/mercedes/migrations/0003_auto_20190815_2238.py new file mode 100644 index 0000000..ba6f47c --- /dev/null +++ b/mercedes/migrations/0003_auto_20190815_2238.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.4 on 2019-08-15 22:38 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('mercedes', '0002_auto_20190815_2238'), + ] + + operations = [ + migrations.AlterField( + model_name='mercedes', + name='carry_on', + field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.SET_DEFAULT, related_name='carry_on', to='passengers.CarryOn'), + ), + ] diff --git a/mercedes/migrations/0004_mercedes_money.py b/mercedes/migrations/0004_mercedes_money.py new file mode 100644 index 0000000..5b47250 --- /dev/null +++ b/mercedes/migrations/0004_mercedes_money.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.4 on 2019-08-15 22:44 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mercedes', '0003_auto_20190815_2238'), + ] + + operations = [ + migrations.AddField( + model_name='mercedes', + name='money', + field=models.CharField(default=None, max_length=10), + ), + ] diff --git a/mercedes/migrations/__init__.py b/mercedes/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/mercedes/models.py b/mercedes/models.py new file mode 100644 index 0000000..74d12d7 --- /dev/null +++ b/mercedes/models.py @@ -0,0 +1,9 @@ +from django.db import models +from passengers.models import Passenger + +# Create your models here. +class Mercedes(Passenger): + quote = models.CharField(max_length=1024) + money = models.CharField(max_length=10, default=None) + def __str__(self): + return self.name \ No newline at end of file diff --git a/mercedes/tests.py b/mercedes/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/mercedes/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/mercedes/views.py b/mercedes/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/mercedes/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/snakes_on_plane_project/settings.py b/snakes_on_plane_project/settings.py index 995cbec..ddfb1b7 100644 --- a/snakes_on_plane_project/settings.py +++ b/snakes_on_plane_project/settings.py @@ -38,6 +38,12 @@ 'django.contrib.messages', 'django.contrib.staticfiles', 'passengers.apps.PassengersConfig', + + + + + + 'mercedes.apps.MercedesConfig', ] MIDDLEWARE = [