dev deploy#233
Conversation
Since now the PR has to be sent to the predev rather than develop, the incoming PR's need to be consistent with the predev.
Fixed Issue #212
Move Journey from header to footer
* add pre-commit * configure flake8 and yapf * configure travis to run all pre-commit hooks on changed files * run yapf on whole codebase and fix issues * add info on how to install pre-commit hooks
Fix for #210: Removed target attribute from some links.
Use console email backend if DEBUG=true
Make journey page responsive
typing error fixed
…stCase Added test case
Added test case for Chat session View, Contest Form
Add the Documentation of the website and contributing guide to Read the Docs
settings for dev, predev and production.
Use env variables to set SMTP settings
* Fix travis failure, update settings.DATABASES * Predev merge (#138) Few order changes to keep in sync with predev
* list all chat sessions * migration and fixes * aah migrations issues
| from .base import * | ||
|
|
||
|
|
||
| DEBUG = os.getenv("DEBUG", False) |
There was a problem hiding this comment.
'os' may be undefined, or defined from star imports: .base
| @@ -0,0 +1,5 @@ | |||
| # production settings | |||
| from .base import * | |||
There was a problem hiding this comment.
'from .base import *' used; unable to detect undefined names
| from .base import * | ||
|
|
||
|
|
||
| DEBUG = os.getenv("DEBUG", True) |
There was a problem hiding this comment.
'os' may be undefined, or defined from star imports: .base
| @@ -0,0 +1,5 @@ | |||
| # predev settings | |||
| from .base import * | |||
There was a problem hiding this comment.
'from .base import *' used; unable to detect undefined names
| from .base import * | ||
|
|
||
|
|
||
| DEBUG = os.getenv("DEBUG", False) |
There was a problem hiding this comment.
'os' may be undefined, or defined from star imports: .base
| class ContestCreateValidation(TestCase): | ||
| def test_contest_create(self): | ||
| c = Client() | ||
| response = c.post('/contest_new/', {'name': 'oshc', 'link': 'http://google.com/', 'description': 'This is a sample description', 'start_date': '2014-04-03', 'end_date': '2014-04-04', 'approved': 'True'}) |
There was a problem hiding this comment.
line too long (211 > 79 characters)
| class ContestCreateTestCase(TestCase): | ||
| def setUp(self): | ||
| Contest.objects.create(name="oshc", link="http://google.com/", description="This is a sample description", | ||
| start_date="2014-04-03", end_date="2014-04-04", approved=True) |
There was a problem hiding this comment.
line too long (93 > 79 characters)
|
|
||
| class ContestCreateTestCase(TestCase): | ||
| def setUp(self): | ||
| Contest.objects.create(name="oshc", link="http://google.com/", description="This is a sample description", |
There was a problem hiding this comment.
line too long (114 > 79 characters)
| self.start_date = timezone.make_aware(datetime.datetime(2017, 11, 6, 12, 10, 5)) | ||
| self.end_date = timezone.make_aware(datetime.datetime(2017, 12, 15, 22, 45, 50)) | ||
| chatSession.objects.create(title="oshc-session", profile_name="test_name", profile_url="http://google.com/", description="This is a sample description", | ||
| start_date=self.start_date, end_date=self.end_date, register_url="http://google.com/") |
There was a problem hiding this comment.
line too long (121 > 79 characters)
| def setUp(self): | ||
| self.start_date = timezone.make_aware(datetime.datetime(2017, 11, 6, 12, 10, 5)) | ||
| self.end_date = timezone.make_aware(datetime.datetime(2017, 12, 15, 22, 45, 50)) | ||
| chatSession.objects.create(title="oshc-session", profile_name="test_name", profile_url="http://google.com/", description="This is a sample description", |
There was a problem hiding this comment.
line too long (160 > 79 characters)
| class ChatSessionCreateTestCase(TestCase): | ||
| def setUp(self): | ||
| self.start_date = timezone.make_aware(datetime.datetime(2017, 11, 6, 12, 10, 5)) | ||
| self.end_date = timezone.make_aware(datetime.datetime(2017, 12, 15, 22, 45, 50)) |
|
|
||
| class ChatSessionCreateTestCase(TestCase): | ||
| def setUp(self): | ||
| self.start_date = timezone.make_aware(datetime.datetime(2017, 11, 6, 12, 10, 5)) |
| class chatSession(models.Model): | ||
| title = models.CharField(max_length=128, help_text="Session title") | ||
| <<<<<<< issue1 | ||
| name = models.CharField(max_length=128, help_text="Session title") |
|
|
||
| class chatSession(models.Model): | ||
| title = models.CharField(max_length=128, help_text="Session title") | ||
| <<<<<<< issue1 |
There was a problem hiding this comment.
IndentationError: expected an indented block
expected 2 blank lines after class or function definition, found 0
expected an indented block
missing whitespace around bitwise or shift operator
missing whitespace around operator
| ('profile_name', models.CharField(help_text="The person's name", | ||
| max_length=128)), | ||
| ('profile_url', models.URLField(help_text="The Url of the " + | ||
| "person's website")), |
There was a problem hiding this comment.
continuation line over-indented for visual indent
line too long (80 > 79 characters)
|
|
||
|
|
||
|
|
||
| # -- Options for Epub output ---------------------------------------------- |
| 'sphinx.ext.todo', | ||
| 'sphinx.ext.coverage', | ||
| 'sphinx.ext.mathjax', | ||
| 'sphinx.ext.githubpages'] |
There was a problem hiding this comment.
continuation line under-indented for visual indent
| 'sphinx.ext.doctest', | ||
| 'sphinx.ext.todo', | ||
| 'sphinx.ext.coverage', | ||
| 'sphinx.ext.mathjax', |
There was a problem hiding this comment.
continuation line under-indented for visual indent
| extensions = ['sphinx.ext.autodoc', | ||
| 'sphinx.ext.doctest', | ||
| 'sphinx.ext.todo', | ||
| 'sphinx.ext.coverage', |
There was a problem hiding this comment.
continuation line under-indented for visual indent
|
|
||
| extensions = ['sphinx.ext.autodoc', | ||
| 'sphinx.ext.doctest', | ||
| 'sphinx.ext.todo', |
There was a problem hiding this comment.
continuation line under-indented for visual indent
Checklist
predevbranch.Which issue does this PR fix?: fixes #
Brief description of what this PR does.
Add issue number here. If you do not solve the issue entirely, please change the message e.g. "First steps for issues #IssueNumber"
Why do we need this PR?:
If relevant, please include a screenshot.
Demo (optional):
Some tips for you to write the instructions:
Testing instructions:
If there is any work still left to do, please add it here.
TODOs (if any):
A picture of a cute animal (not mandatory but encouraged):