Skip to content

dev deploy#233

Closed
tapaswenipathak wants to merge 40 commits into
developfrom
predev
Closed

dev deploy#233
tapaswenipathak wants to merge 40 commits into
developfrom
predev

Conversation

@tapaswenipathak

Copy link
Copy Markdown
Member

Checklist

  • My branch is up-to-date with the upstream predev branch.
  • I have added necessary documentation (if appropriate).

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:

  • Prefer bulleted description
  • Start after checking out this branch
  • Include any setup required, such as migrating databases, etc.

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):

amakarudze and others added 30 commits October 21, 2017 03:34
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.
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
Added test case for Chat session View, Contest Form
tapaswenipathak and others added 9 commits December 17, 2018 00:15
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)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'os' may be undefined, or defined from star imports: .base

@@ -0,0 +1,5 @@
# production settings
from .base import *

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'from .base import *' used; unable to detect undefined names

from .base import *


DEBUG = os.getenv("DEBUG", True)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'os' may be undefined, or defined from star imports: .base

@@ -0,0 +1,5 @@
# predev settings
from .base import *

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'from .base import *' used; unable to detect undefined names

Comment thread oshc/oshc/settings/dev.py
from .base import *


DEBUG = os.getenv("DEBUG", False)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'os' may be undefined, or defined from star imports: .base

Comment thread oshc/main/tests.py
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'})

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line too long (211 > 79 characters)

Comment thread oshc/main/tests.py
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)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line too long (93 > 79 characters)

Comment thread oshc/main/tests.py

class ContestCreateTestCase(TestCase):
def setUp(self):
Contest.objects.create(name="oshc", link="http://google.com/", description="This is a sample description",

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line too long (114 > 79 characters)

Comment thread oshc/main/tests.py
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/")

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line too long (121 > 79 characters)

Comment thread oshc/main/tests.py
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",

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line too long (160 > 79 characters)

Comment thread oshc/main/tests.py
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))

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line too long (88 > 79 characters)

Comment thread oshc/main/tests.py

class ChatSessionCreateTestCase(TestCase):
def setUp(self):
self.start_date = timezone.make_aware(datetime.datetime(2017, 11, 6, 12, 10, 5))

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line too long (88 > 79 characters)

Comment thread oshc/main/models.py
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")

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unexpected indentation

Comment thread oshc/main/models.py

class chatSession(models.Model):
title = models.CharField(max_length=128, help_text="Session title")
<<<<<<< issue1

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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")),

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

continuation line over-indented for visual indent
line too long (80 > 79 characters)

Comment thread docs/source/conf.py



# -- Options for Epub output ----------------------------------------------

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

too many blank lines (3)

Comment thread docs/source/conf.py
'sphinx.ext.todo',
'sphinx.ext.coverage',
'sphinx.ext.mathjax',
'sphinx.ext.githubpages']

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

continuation line under-indented for visual indent

Comment thread docs/source/conf.py
'sphinx.ext.doctest',
'sphinx.ext.todo',
'sphinx.ext.coverage',
'sphinx.ext.mathjax',

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

continuation line under-indented for visual indent

Comment thread docs/source/conf.py
extensions = ['sphinx.ext.autodoc',
'sphinx.ext.doctest',
'sphinx.ext.todo',
'sphinx.ext.coverage',

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

continuation line under-indented for visual indent

Comment thread docs/source/conf.py

extensions = ['sphinx.ext.autodoc',
'sphinx.ext.doctest',
'sphinx.ext.todo',

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

continuation line under-indented for visual indent

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.