Upgrade to Django 1.9 #282
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is a fairly extensive commit, since most of the requirements had
to be upgraded as well. Dependencies have been locked down to specific
versions for consistency and troubleshooting. Notable changes:
- Moved wsgi.py to a more standard location, updated apache config.
Now referenced in roundware.settings.WSGI_APPLICATION
- For roundware.api2, implemented the new Application Configuration
structure. See http://stackoverflow.com/q/32795227/1943591
- django-guardian now creates its own AnonymousUser in the database.
Removed AnonymousUser references from fixtures to avoid conflicts.
http://django-guardian.readthedocs.io/en/stable/configuration.html
- ManyToManyField no longer accepts null=True
- django.contrib.auth.models.User should not be accessed directly.
Use django.conf.settings.AUTH_USER_MODEL instead
- Django changed the way it loads models, which broke streaming.
Moving django.setup() in roundwared.rwstreamd fixed the issue.
- django_chartit is no longer maintained. Moved to django_chartit2
This may require us to install jQuery and Highcharts manually
- django.forms.models.save_instance has been removed.
We are now calling save() instead, but it might need more testing.
django/django@8656cf
django/django@b11564
|
Can you fix the merge conflicts? It'll require a rebase to update this branch. |
|
To be honest, I don't even know if I have write access to this repository. I also do not want to take responsibility for the final merge. I'm happy to advise and explain what's what, but I'll leave the final call to @hburgund. |
|
@IllyaMoskvin I will certainly take care of the merging once it is tested more and I'm comfortable with everything. I believe @eosrei is referring to the fact that your PR cannot be merged automatically since there are some conflicts with the current state of |
|
@hburgund Yes, plus Travis.ci will not run until the PR can be merged. |
|
Hmm alright, so what I think I'll do is create a new branch on IMAmuseum/roundware-server that's based on the develop branch here as it is now, and then cherry pick this commit into it. Let me go ahead and close this request; I'll open up a new one shortly. If after that it still cannot be merged automatically, I don't think there is anything else I can really do, but let me give that a shot first. |
|
@IllyaMoskvin FWIW you can do all of that without closing this PR. Rebase your local branch, force push to your remote and it'll update this PR. |
Merged
IllyaMoskvin
added a commit
to IMAmuseum/roundware-server
that referenced
this pull request
Jul 25, 2016
This is a fairly extensive commit, since most of the requirements had
to be upgraded as well. Dependencies have been locked down to specific
versions for consistency and troubleshooting. Notable changes:
- Moved wsgi.py to a more standard location, updated apache config.
Now referenced in roundware.settings.WSGI_APPLICATION
- For roundware.api2, implemented the new Application Configuration
structure. See http://stackoverflow.com/q/32795227/1943591
- django-guardian now creates its own AnonymousUser in the database.
Removed AnonymousUser references from fixtures to avoid conflicts.
http://django-guardian.readthedocs.io/en/stable/configuration.html
- django-guardian assign is being depricated for assign_perm
See django-guardian/django-guardian@1419048
- ManyToManyField no longer accepts null=True
- django.contrib.auth.models.User should not be accessed directly.
Use django.conf.settings.AUTH_USER_MODEL instead
- Django changed the way it loads models, which broke streaming.
Moving django.setup() in roundwared.rwstreamd fixed the issue.
- django_chartit is no longer maintained. Moved to django_chartit2
This may require us to install jQuery and Highcharts manually
- django.forms.models.save_instance has been removed.
We are now calling save() instead, but it might need more testing.
django/django@8656cf
django/django@b11564
- Fixed errors in Travis install script (thanks @hburgund)
- Fixed jsocol/django-adminplus/issues/42
- Fixed django-admin-bootstrapped dependency
See IMAmuseum/django-admin-bootstrapped
- Fixed queryset filtering in ProjectProtectedThrough classes in admin.py
Added explicit permission-based queryset filtering to ProjectAdmin
- Fixed duplicate rows in auth_permission, removed default_auth fixtures.
This closes roundware#229, fixes roundware#291, and supersedes roundware#282.
IllyaMoskvin
added a commit
to IMAmuseum/roundware-server
that referenced
this pull request
Jul 26, 2016
This is a fairly extensive commit, since most of the requirements had
to be upgraded as well. Dependencies have been locked down to specific
versions for consistency and troubleshooting. Notable changes:
- Moved wsgi.py to a more standard location, updated apache config.
Now referenced in roundware.settings.WSGI_APPLICATION
- For roundware.api2, implemented the new Application Configuration
structure. See http://stackoverflow.com/q/32795227/1943591
- django-guardian now creates its own AnonymousUser in the database.
Removed AnonymousUser references from fixtures to avoid conflicts.
http://django-guardian.readthedocs.io/en/stable/configuration.html
- django-guardian assign is being depricated for assign_perm
See django-guardian/django-guardian@1419048
- ManyToManyField no longer accepts null=True
- django.contrib.auth.models.User should not be accessed directly.
Use django.conf.settings.AUTH_USER_MODEL instead
- Django changed the way it loads models, which broke streaming.
Moving django.setup() in roundwared.rwstreamd fixed the issue.
- django_chartit is no longer maintained. Moved to django_chartit2
This may require us to install jQuery and Highcharts manually
- django.forms.models.save_instance has been removed.
We are now calling save() instead, but it might need more testing.
django/django@8656cf
django/django@b11564
- Fixed errors in Travis install script (thanks @hburgund)
- Fixed jsocol/django-adminplus/issues/42
- Fixed django-admin-bootstrapped dependency
See IMAmuseum/django-admin-bootstrapped
- Fixed queryset filtering in ProjectProtectedThrough classes in admin.py
Added explicit permission-based queryset filtering to ProjectAdmin
- Fixed duplicate rows in auth_permission, removed default_auth fixtures.
This closes roundware#229, fixes roundware#291, and supersedes roundware#282.
IllyaMoskvin
added a commit
to IMAmuseum/roundware-server
that referenced
this pull request
Jul 26, 2016
This is a fairly extensive commit, since most of the requirements had
to be upgraded as well. Dependencies have been locked down to specific
versions for consistency and troubleshooting. Notable changes:
- Moved wsgi.py to a more standard location, updated apache config.
Now referenced in roundware.settings.WSGI_APPLICATION
- For roundware.api2, implemented the new Application Configuration
structure. See http://stackoverflow.com/q/32795227/1943591
- django-guardian now creates its own AnonymousUser in the database.
Removed AnonymousUser references from fixtures to avoid conflicts.
http://django-guardian.readthedocs.io/en/stable/configuration.html
- django-guardian assign is being depricated for assign_perm
See django-guardian/django-guardian@1419048
- ManyToManyField no longer accepts null=True
- django.contrib.auth.models.User should not be accessed directly.
Use django.conf.settings.AUTH_USER_MODEL instead
- Django changed the way it loads models, which broke streaming.
Moving django.setup() in roundwared.rwstreamd fixed the issue.
- django_chartit is no longer maintained. Moved to django_chartit2
This may require us to install jQuery and Highcharts manually
- django.forms.models.save_instance has been removed.
We are now calling save() instead, but it might need more testing.
django/django@8656cf
django/django@b11564
- Fixed errors in Travis install script (thanks @hburgund)
- Fixed jsocol/django-adminplus/issues/42
- Fixed django-admin-bootstrapped dependency
See IMAmuseum/django-admin-bootstrapped
- Fixed queryset filtering in ProjectProtectedThrough classes in admin.py
Added explicit permission-based queryset filtering to ProjectAdmin
- Fixed duplicate rows in auth_permission, removed default_auth fixtures.
This closes roundware#229, fixes roundware#291, and supersedes roundware#282.
IllyaMoskvin
added a commit
to IMAmuseum/roundware-server
that referenced
this pull request
Jul 26, 2016
This is a fairly extensive commit, since most of the requirements had
to be upgraded as well. Dependencies have been locked down to specific
versions for consistency and troubleshooting. Notable changes:
- Moved wsgi.py to a more standard location, updated apache config.
Now referenced in roundware.settings.WSGI_APPLICATION
- For roundware.api2, implemented the new Application Configuration
structure. See http://stackoverflow.com/q/32795227/1943591
- django-guardian now creates its own AnonymousUser in the database.
Removed AnonymousUser references from fixtures to avoid conflicts.
http://django-guardian.readthedocs.io/en/stable/configuration.html
- django-guardian assign is being depricated for assign_perm
See django-guardian/django-guardian@1419048
- ManyToManyField no longer accepts null=True
- django.contrib.auth.models.User should not be accessed directly.
Use django.conf.settings.AUTH_USER_MODEL instead
- Django changed the way it loads models, which broke streaming.
Moving django.setup() in roundwared.rwstreamd fixed the issue.
- django_chartit is no longer maintained. Moved to django_chartit2
This may require us to install jQuery and Highcharts manually
- django.forms.models.save_instance has been removed.
We are now calling save() instead, but it might need more testing.
django/django@8656cf
django/django@b11564
- Fixed errors in Travis install script (thanks @hburgund)
- Fixed jsocol/django-adminplus/issues/42
- Fixed django-admin-bootstrapped dependency
See IMAmuseum/django-admin-bootstrapped
- Fixed queryset filtering in ProjectProtectedThrough classes in admin.py
Added explicit permission-based queryset filtering to ProjectAdmin
- Fixed duplicate rows in auth_permission, removed default_auth fixtures.
This closes roundware#229, fixes roundware#291, and supersedes roundware#282.
IllyaMoskvin
added a commit
to IMAmuseum/roundware-server
that referenced
this pull request
Jul 26, 2016
This is a fairly extensive commit, since most of the requirements had
to be upgraded as well. Dependencies have been locked down to specific
versions for consistency and troubleshooting. Notable changes:
- Moved wsgi.py to a more standard location, updated apache config.
Now referenced in roundware.settings.WSGI_APPLICATION
- For roundware.api2, implemented the new Application Configuration
structure. See http://stackoverflow.com/q/32795227/1943591
- django-guardian now creates its own AnonymousUser in the database.
Removed AnonymousUser references from fixtures to avoid conflicts.
http://django-guardian.readthedocs.io/en/stable/configuration.html
- django-guardian assign is being depricated for assign_perm
See django-guardian/django-guardian@1419048
- ManyToManyField no longer accepts null=True
- django.contrib.auth.models.User should not be accessed directly.
Use django.conf.settings.AUTH_USER_MODEL instead
- Django changed the way it loads models, which broke streaming.
Moving django.setup() in roundwared.rwstreamd fixed the issue.
- django_chartit is no longer maintained. Moved to django_chartit2
This may require us to install jQuery and Highcharts manually
- django.forms.models.save_instance has been removed.
We are now calling save() instead, but it might need more testing.
django/django@8656cf
django/django@b11564
- Fixed errors in Travis install script (thanks @hburgund)
- Fixed jsocol/django-adminplus/issues/42
- Fixed django-admin-bootstrapped dependency
See IMAmuseum/django-admin-bootstrapped
- Fixed queryset filtering in ProjectProtectedThrough classes in admin.py
Added explicit permission-based queryset filtering to ProjectAdmin
- Fixed duplicate rows in auth_permission, removed default_auth fixtures.
- Removed fix-m2m-deserial.patch
This closes roundware#229, fixes roundware#291, and supersedes roundware#282.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a fairly extensive commit, since most of the requirements had
to be upgraded as well. Dependencies have been locked down to specific
versions for consistency and troubleshooting. Notable changes:
Now referenced in roundware.settings.WSGI_APPLICATION
structure. See http://stackoverflow.com/q/32795227/1943591
Removed AnonymousUser references from fixtures to avoid conflicts.
http://django-guardian.readthedocs.io/en/stable/configuration.html
Use django.conf.settings.AUTH_USER_MODEL instead
Moving django.setup() in roundwared.rwstreamd fixed the issue.
This may require us to install jQuery and Highcharts manually
We are now calling save() instead, but it might need more testing.
django/django@8656cf
django/django@b11564