Add Django 1.7 support. #15

charettes · 2014-09-17T04:16:33Z

No description provided.

arescope · 2014-09-17T08:54:29Z

So far, its migrating and creates the schema properly when create a new Tenant.

Regarding ModelForm and Create, Update, Detailview, where I need to specify the model that will use...do you have any suggestion or example of how to make it the cleanest way?

Thank you so much in advance

charettes · 2014-09-17T15:28:44Z

@arescope, I suggest you take a look at tenancy.views.TenantModelFormMixin.

You should be able to define a normal ModelForm subclass and simply add this mixin to your Create|Update|DeleteView subclass. Use tenancy.views.TenantObjectMixin for your DetailView subclasses.

arescope · 2014-09-18T04:22:15Z

hi @charettes . Yes I tried that and it is working properly. Thank you.

So far, it is working, but I need to test much more, I've around 100 models to test. I will let you know during this days.

arescope · 2014-09-18T05:04:04Z

@charettes actually I discover a bug...or something like that... When I created an initial migration it happens this

# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations


class Migration(migrations.Migration):

    dependencies = [
    ]

    operations = [
        migrations.CreateModel(
            name='Notice',
            fields=[
            ],
            options={
                'ordering': ['-pub_date'],
                'managed': False,
            },
            bases=(models.Model,),
        ),
    ]

is it normal???

coveralls · 2014-11-23T09:16:56Z

Coverage increased (+0.08%) when pulling 85ac2f2 on django-1.7 into 84237ad on master.

Add Django 1.7 support.

charettes · 2014-11-23T09:18:05Z

@arescope let me know if this works for you. I'll move the migration issue to another ticket.

arescope · 2014-11-24T01:42:38Z

Hi @charettes, I got this error when running runserver

Traceback (most recent call last):
  File "manage.py", line 10, in <module>
    execute_from_command_line(sys.argv)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/core/management/__init__.py", line 385, in execute_from_command_line
    utility.execute()
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/core/management/__init__.py", line 354, in execute
    django.setup()
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/__init__.py", line 21, in setup
    apps.populate(settings.INSTALLED_APPS)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/apps/registry.py", line 108, in populate
    app_config.import_models(all_models)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/apps/config.py", line 202, in import_models
    self.models_module = import_module(models_module_name)
  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/importlib/__init__.py", line 37, in import_module
    __import__(name)
  File "/Users/arescope/Projects/bwcored/appointments/models.py", line 28, in <module>
    class Role(TimeStampedModel):
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/models.py", line 204, in __new__
    any(issubclass(base, TenantSpecificModel) for base in bases)):
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/models.py", line 204, in <genexpr>
    any(issubclass(base, TenantSpecificModel) for base in bases)):
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/abc.py", line 161, in __subclasscheck__
    ok = cls.__subclasshook__(subclass)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/models.py", line 182, in __subclasshook__
    tenant_model = get_tenant_model(False)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/__init__.py", line 11, in get_tenant_model
    from .settings import TENANT_MODEL
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/settings.py", line 54, in <module>
    lazy_class_prepared(app_label, model_name, is_tenant_user_model)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/signals.py", line 15, in lazy_class_prepared
    seed_cache=False, only_installed=False
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/utils.py", line 30, in get_model
    return apps.get_model(app_label, model_name)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/apps/registry.py", line 199, in get_model
    self.check_models_ready()
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/apps/registry.py", line 131, in check_models_ready
    raise AppRegistryNotReady("Models aren't loaded yet.")
django.core.exceptions.AppRegistryNotReady: Models aren't loaded yet.

arescope · 2014-11-24T01:51:00Z

The problem is with my CustomUserModel that it seems not loaded yet. Even in the INSTALLED_APPS is declared before.

arescope · 2014-11-24T03:01:57Z

about the migrations, I did this and so far, is working.
I took from your first approach for south

https://gist.github.com/arescope/e18d5c226c7b81335f68

charettes · 2014-11-24T20:11:09Z

@arescope could you make sure f708167 fixed your issue and add the migration reference to #24.

arescope · 2014-11-25T02:21:05Z

Hi,
getting this now

Traceback (most recent call last):
  File "manage.py", line 10, in <module>
    execute_from_command_line(sys.argv)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/core/management/__init__.py", line 385, in execute_from_command_line
    utility.execute()
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/core/management/__init__.py", line 354, in execute
    django.setup()
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/__init__.py", line 21, in setup
    apps.populate(settings.INSTALLED_APPS)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/apps/registry.py", line 109, in populate
    app_config.import_models(all_models)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/apps/config.py", line 201, in import_models
    self.models_module = import_module(models_module_name)
  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/importlib/__init__.py", line 37, in import_module
    __import__(name)
  File "/Users/arescope/Projects//bwcored/appointments/models.py", line 28, in <module>
    class Role(TimeStampedModel):
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/models.py", line 204, in __new__
    any(issubclass(base, TenantSpecificModel) for base in bases)):
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/models.py", line 204, in <genexpr>
    any(issubclass(base, TenantSpecificModel) for base in bases)):
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/abc.py", line 161, in __subclasscheck__
    ok = cls.__subclasshook__(subclass)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/models.py", line 182, in __subclasshook__
    tenant_model = get_tenant_model(False)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/__init__.py", line 21, in get_tenant_model
    "been installed" % (app_label, object_name)
django.core.exceptions.ImproperlyConfigured: TENANCY_TENANT_MODEL refers to model 'estates.Estate' that has not been installed

As far as i saw,ur method get_modelcalls apps.get_model.

This method check if all the models have been loaded, that is not true at this point.
So, I tried to change to apps.get_registered_model, which creates again a deadlock.

As far as I understand the code, at the beginning apps.populate is called. That acquires apps._lock, so any time remove_from_app_cache is called it will try to acquire apps._lock, action which create a dead lock.

So the solution is not using that lock, or use another way to clean the cache.

Mostly this happen with multi-app projects I think.

I hope all my input help you to fix the problem.

charettes · 2014-11-25T12:54:55Z

0bdabb5 should deal with this.

arescope · 2014-11-26T01:40:46Z

Hi,

Having this now...assume that Role is Tenant Specific Model.

Traceback (most recent call last):
  File "manage.py", line 10, in <module>
    execute_from_command_line(sys.argv)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/core/management/__init__.py", line 385, in execute_from_command_line
    utility.execute()
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/core/management/__init__.py", line 354, in execute
    django.setup()
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/__init__.py", line 21, in setup
    apps.populate(settings.INSTALLED_APPS)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/apps/registry.py", line 108, in populate
    app_config.import_models(all_models)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/apps/config.py", line 201, in import_models
    self.models_module = import_module(models_module_name)
  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/importlib/__init__.py", line 37, in import_module
    __import__(name)
  File "/Users/arescope/Projects//bwcored/appointments/models.py", line 28, in <module>
    class Role(TimeStampedModel):
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/models.py", line 292, in __new__
    tenant_model = get_tenant_model(False)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/__init__.py", line 21, in get_tenant_model
    "been installed" % (app_label, object_name)
django.core.exceptions.ImproperlyConfigured: TENANCY_TENANT_MODEL refers to model 'estates.Estate' that has not been installed

charettes · 2014-11-26T05:31:31Z

Ok nailed it down in a2c75a8.

arescope · 2014-11-26T07:47:47Z

Hi, that seems fixed.

But still entering into the deadlock

Traceback (most recent call last):
  File "manage.py", line 10, in <module>
    execute_from_command_line(sys.argv)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/core/management/__init__.py", line 385, in execute_from_command_line
    utility.execute()
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/core/management/__init__.py", line 354, in execute
    django.setup()
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/__init__.py", line 21, in setup
    apps.populate(settings.INSTALLED_APPS)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/apps/registry.py", line 108, in populate
    app_config.import_models(all_models)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/django/apps/config.py", line 201, in import_models
    self.models_module = import_module(models_module_name)
  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/importlib/__init__.py", line 37, in import_module
    __import__(name)
  File "/Users/arescope/Projects//bwcored/cases/models.py", line 25, in <module>
    class Case(TimeStampedModel):
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/models.py", line 273, in __new__
    remove_from_app_cache(through)
  File "/Users/arescope/.virtualenvs/bw/lib/python2.7/site-packages/tenancy/utils.py", line 42, in remove_from_app_cache
    raise Exception('Here it comes the deadlock')
Exception: Here it comes the deadlock

This model has manytomany fields.

and apps.populate(settings.INSTALLED_APPS) also acquires the lock. So maybe we should consider another way to clear the app_ache

charettes · 2014-11-26T18:09:16Z

I see, the new apps._lock is not re-entrant like it used to be.

I guess I'll need to prevent acquisition if the apps are not ready yet.

charettes · 2014-11-26T18:29:32Z

e41f2df should do.

arescope · 2014-11-27T01:44:30Z

Hi,

There is no deadlock anymore! Thank you.

However, I find a new issue, and is that the related_name in TenantMeta is not propagated to the tenant. That is because when call get_model, it is not ready the model still. I think for D1.7 changing from apps.get_model to apps.get_registered_model could be a solution. I tried by myself and it seems working.

Thank you

charettes · 2014-11-27T01:51:59Z

I'm not sure I understand what you mean.

TenantModelDescriptor seems to be correctly attached on my side, and they're also tested.

charettes · 2014-11-27T02:01:21Z

Ahhh I think I understand what you mean!

If the class has been prepared but has not been registered the related the descriptor will never be attached.

Fixed in 1b879a6.

arescope · 2014-11-27T02:10:29Z

Yup!! Thats it! Sorry for being so cryptic sometimes :).
I will test carefully but I think now everything should be ok.
About the migrations, you can take a look to my gist if you want.

arescope · 2014-11-27T02:36:12Z

Oh, Still the issue I reported on #16

I applied this patch https://gist.github.com/arescope/3e422d14cd480fc8ca69 and seems to work

charettes · 2014-11-27T02:47:33Z

Let's move the discussion on #16, I don't think the issue is related to Django 1.7 only.

Unfortunately your patch completely removes the generic relation instead of making it work correctly.

charettes mentioned this pull request Sep 17, 2014

Any expectation to make compatible with django 1.7 #14

Closed

charettes force-pushed the django-1.7 branch from 6637ee8 to 98faa32 Compare September 17, 2014 04:53

charettes mentioned this pull request Sep 19, 2014

Migrations not working #17

Closed

charettes force-pushed the django-1.7 branch 6 times, most recently from bc4847e to e390387 Compare November 23, 2014 09:06

charettes added 3 commits November 23, 2014 10:06

Added support for Django 1.7

747bc2e

Dropped support for Django 1.5

10e190a

Fixed tests to run against master.

85ac2f2

charettes force-pushed the django-1.7 branch from e390387 to 85ac2f2 Compare November 23, 2014 09:06

charettes mentioned this pull request Nov 23, 2014

calling remove_from_apps_registry makes deadlock in 1.7 #20

Closed

charettes added a commit that referenced this pull request Nov 23, 2014

Merge pull request #15 from charettes/django-1.7

d21fd0e

Add Django 1.7 support.

charettes merged commit d21fd0e into master Nov 23, 2014

charettes deleted the django-1.7 branch November 24, 2014 19:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Django 1.7 support. #15

Add Django 1.7 support. #15

charettes commented Sep 17, 2014

arescope commented Sep 17, 2014

charettes commented Sep 17, 2014

arescope commented Sep 18, 2014

arescope commented Sep 18, 2014

coveralls commented Nov 23, 2014

charettes commented Nov 23, 2014

arescope commented Nov 24, 2014

arescope commented Nov 24, 2014

arescope commented Nov 24, 2014

charettes commented Nov 24, 2014

arescope commented Nov 25, 2014

charettes commented Nov 25, 2014

arescope commented Nov 26, 2014

charettes commented Nov 26, 2014

arescope commented Nov 26, 2014

charettes commented Nov 26, 2014

charettes commented Nov 26, 2014

arescope commented Nov 27, 2014

charettes commented Nov 27, 2014

charettes commented Nov 27, 2014

arescope commented Nov 27, 2014

arescope commented Nov 27, 2014

charettes commented Nov 27, 2014

Add Django 1.7 support. #15

Add Django 1.7 support. #15

Conversation

charettes commented Sep 17, 2014

arescope commented Sep 17, 2014

charettes commented Sep 17, 2014

arescope commented Sep 18, 2014

arescope commented Sep 18, 2014

coveralls commented Nov 23, 2014

charettes commented Nov 23, 2014

arescope commented Nov 24, 2014

arescope commented Nov 24, 2014

arescope commented Nov 24, 2014

charettes commented Nov 24, 2014

arescope commented Nov 25, 2014

charettes commented Nov 25, 2014

arescope commented Nov 26, 2014

charettes commented Nov 26, 2014

arescope commented Nov 26, 2014

charettes commented Nov 26, 2014

charettes commented Nov 26, 2014

arescope commented Nov 27, 2014

charettes commented Nov 27, 2014

charettes commented Nov 27, 2014

arescope commented Nov 27, 2014

arescope commented Nov 27, 2014

charettes commented Nov 27, 2014