Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Django 3 and virtualenv #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Django 3 and virtualenv #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99edb72
fix for python in virtualenv
mike-tk Sep 30, 2020
eca0013
Fix for newer django
mike-tk Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions autotask/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

import sys
from django.conf import settings as django_settings


Expand All @@ -20,7 +20,7 @@ def _set_defaults(self):
self.AUTOTASK_HANDLE_TASK_IDLE_TIME = 10
self.AUTOTASK_IS_ACTIVE = False
self.AUTOTASK_WORKERS = 1
self.AUTOTASK_WORKER_EXECUTABLE = 'python'
self.AUTOTASK_WORKER_EXECUTABLE = sys.executable or 'python'
self.AUTOTASK_WORKER_MONITOR_INTERVALL = 5
self.AUTOTASK_RETRY_DELAY = 2
self.DEBUG = True # used for running pytest with threads
Expand Down
2 changes: 1 addition & 1 deletion autotask/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from datetime import timedelta

from django.db import models
from django.utils.encoding import python_2_unicode_compatible
from six import python_2_unicode_compatible
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _

Expand Down