Jkmarx/update httpresponse #2533

jkmarx · 2018-01-24T18:24:37Z

Include HttpResponse to JsonResponse
Include module_name -> model name
Fix unit tests due to transaction management error caused from the upgrade
Fix issue regarding missing third party migrations with library upgrades and a dependency migration added
Fix issue with Registration library by including dependency in migration (for discussion)

…or default.

jkmarx · 2018-02-06T02:20:24Z

refinery/analysis_manager/tests.py

@@ -176,18 +176,6 @@ def test_fetch_objects_required_for_analyses_bad_user(self):
            )
            self.assertIn("Couldn't fetch User", context.exception.message)

-    def test_fetch_objects_required_for_analyses_bad_dataset(self):


discussed w/ Scott about removing this unit test since it tests for an error throw outside this function

jkmarx · 2018-02-06T14:11:18Z

refinery/config/settings/base.py

@@ -178,14 +178,14 @@ def get_setting(name, settings=local_settings, default=None):

 # NOTE: the order of INSTALLED_APPS matters in some instances.
 INSTALLED_APPS = (
+    'django.contrib.sites',


registration doc recommendations

Maybe comments to distinguish the lines where order matters (and explain why) from those where we don't think that it does?

jkmarx · 2018-02-06T14:11:40Z

refinery/config/settings/base.py

@@ -615,3 +615,10 @@ def get_setting(name, settings=local_settings, default=None):

 # temporary feature toggle for using S3 as user data file storage backend
 REFINERY_S3_USER_DATA = get_setting('REFINERY_S3_USER_DATA', default=False)
+
+# ALLOWED_HOSTS required in 1.8.16 to prevent a DNS rebinding attack.
+ALLOWED_HOSTS = get_setting("ALLOWED_HOSTS")  # NOQA: F405


required both for dev and prod, so moved to base

I don't think # NOQA: F405 is necessary here (http://flake8.pycqa.org/en/3.1.1/user/error-codes.html)

jkmarx · 2018-02-06T14:12:40Z

refinery/config/settings/base.py

+ALLOWED_HOSTS = get_setting("ALLOWED_HOSTS")  # NOQA: F405
+
+MIGRATION_MODULES = {
+    'chunked_upload': 'dependency_migrations.chunked_upload'


3rd party app has not added their own migration, so we needed to build and include one. Author said they are getting around to it soon.

juliomalegria/django-chunked-upload#21

jkmarx · 2018-02-06T14:13:51Z

refinery/core/management/commands/activate_user.py

@@ -9,8 +9,11 @@
 class Command(BaseCommand):
    help = "Activate user account"

-    def handle(self, username, **options):
+    def add_arguments(self, parser):


changes from outparse argparse change. Writing separate issue to deal with other base commands, but changed this one for unit tests to pass.

mccalluc

Some questions about what's going on, but it may just be confusion on my end.

mccalluc · 2018-02-06T15:40:25Z

refinery/analysis_manager/views.py

@@ -75,8 +74,7 @@ def analysis_status(request, uuid):
        }
        logger.debug("Analysis status for '%s': %s",
                     analysis.name, json.dumps(ret_json))
-        return HttpResponse(json.dumps(ret_json, indent=4),
-                            content_type='application/javascript')
+        return JsonResponse(ret_json, content_type='application/javascript')


JsonResponse docs say:

Its default Content-Type header is set to application/json

Would the default not work here?

it's application/javascript

https://stackoverflow.com/questions/477816/what-is-the-correct-json-content-type

mccalluc · 2018-02-06T15:41:20Z

refinery/analysis_manager/views.py

-            json_serializer.serialize(workflows, ensure_ascii=False),
-            content_type='application/javascript')
+
+        return JsonResponse(workflows, content_type='application/javascript')


mccalluc · 2018-02-06T15:45:07Z

refinery/analysis_manager/views.py

    else:
-        return HttpResponse(data, content_type='application/json')
+        return JsonResponse(curr_workflow.data_inputs.all())


Oh! It does make a difference here? I didn't realize this mattered.

mccalluc · 2018-02-06T15:47:23Z

refinery/config/settings/base.py

@@ -178,14 +178,14 @@ def get_setting(name, settings=local_settings, default=None):

 # NOTE: the order of INSTALLED_APPS matters in some instances.
 INSTALLED_APPS = (
+    'django.contrib.sites',


Maybe comments to distinguish the lines where order matters (and explain why) from those where we don't think that it does?

mccalluc · 2018-02-06T15:56:42Z

refinery/core/views.py

@@ -578,7 +577,7 @@ def solr_select(request, core):
        response = json.dumps({})
    else:
        response = full_response.content
-    return HttpResponse(response, content_type='application/json')
+    return JsonResponse(response)


response may be string rather than a dict here... Change the code above?

Good catch.

mccalluc · 2018-02-06T16:00:12Z

refinery/data_set_manager/views.py

                return HttpResponseRedirect(
                    reverse(self.success_view_name, args=[dataset_uuid])
                )
            else:
                error = 'Problem parsing ISA-Tab file'
                if request.is_ajax():
-                    return HttpResponse(json.dumps({'error': error}),
-                                        content_type='application/json')
+                    return JsonResponse({'error': error})


Would an HTTP error response be appropriate here? (But that's not something you've changed, so perhaps better not to wade into that.)

mccalluc · 2018-02-06T16:04:23Z

refinery/workflow_manager/views.py

@@ -27,10 +27,10 @@ def import_workflows(request):
        logger.debug("Engine: " + engine.name + " - " +
                     str(new_workflow_count) + ' workflows after.')
        workflows += new_workflow_count
-    return HttpResponse(str(workflows) + ' workflows imported.')
+    return HttpResponse(str(workflows) + ' workflows imported.', )


I only know about trailing commas when you want a 1-element tuple: Not sure what's going on here?

That's a typo. :)

mccalluc · 2018-02-06T16:11:13Z

refinery/workflow_manager/views.py



 def download_workflow(request, workflow_uuid):
    """Returns a specified workflow_id as a dictionary object."""
    workflow = get_object_or_404(Workflow, uuid=workflow_uuid)
-    return HttpResponse(workflow.graph)
+    return JsonResponse(workflow.graph)


Will this return the right thing? In the other examples, you had to remove a json.dumps.

scottx611x · 2018-02-06T15:53:13Z

refinery/workflow_manager/views.py



 def download_workflow(request, workflow_uuid):
    """Returns a specified workflow_id as a dictionary object."""
    workflow = get_object_or_404(Workflow, uuid=workflow_uuid)
-    return HttpResponse(workflow.graph)


Do we know that JSON was expected downstream from here?

I was trusting the comment, but will double check.

A unit test would have helped to disambiguate.

@hackdna We're removing workflow_manager....this milestone?? #2463

Good point. I'm removing a lot of stale code as I implement support for S3 to avoid unnecessary work.

scottx611x · 2018-02-06T15:53:45Z

refinery/workflow_manager/views.py

@@ -27,10 +27,10 @@ def import_workflows(request):
        logger.debug("Engine: " + engine.name + " - " +
                     str(new_workflow_count) + ' workflows after.')
        workflows += new_workflow_count
-    return HttpResponse(str(workflows) + ' workflows imported.')
+    return HttpResponse(str(workflows) + ' workflows imported.', )


New trailing comma?

scottx611x · 2018-02-06T15:55:33Z

refinery/selenium_testing/tests.py

+        # recommended solution to an auth_permission error, though doc says
+        # we probably won't need to call it since django will call it
+        # automatically when needed
+        ContentType.objects.clear_cache()


Could we get a link to the recommended solution?

https://groups.google.com/forum/#!topic/django-users/g88m9u8-ozs

It'd be great to add this URL to the comment for future reference.

scottx611x · 2018-02-06T15:59:51Z

refinery/core/tests.py

-    def test_pre_isa_archive_deletion(self):
+    @mock.patch('core.models.DataSet.get_investigation_links')
+    def test_pre_isa_archive_deletion(self, mock_get_links):
+        mock_get_links.return_value = []


Would the mocked return_value be an empty list or None? Also could put the return_value as a named arg in the @mock.patch and save a line

scottx611x · 2018-02-06T16:03:18Z

refinery/core/tests.py

@@ -667,12 +673,16 @@ def test_verify_dataset_deletion_if_analysis_run_upon_it(self):
                          DataSet.objects.get,
                          name="dataset_with_analysis")

-    def test_isa_archive_deletion(self):
+    @mock.patch('core.models.DataSet.get_investigation_links')


If we have to mock this many times it may be good to think about adding a reference in a common setUp() and just .start() the mock in these three tests.

Something like:

def setUp(self): self.get_investigation_links_mock = mock.patch('core.models.DataSet.get_investigation_links', return_value=None) def testA(self): self.get_investigation_links_mock.start()

scottx611x · 2018-02-06T16:04:11Z

refinery/core/migrations/0001_initial.py

@@ -15,6 +15,7 @@ class Migration(migrations.Migration):
        ('data_set_manager', '0001_initial'),
        ('auth', '0001_initial'),
        ('file_store', '0001_initial'),
+        ('registration', '0001_initial')


I haven't had much time to think about this yet, but it still seems scary

Yes. Perhaps, we can discuss in dev. Feel free to mess around with this branch locally if you want to try anything.

scottx611x · 2018-02-06T16:05:49Z

refinery/config/settings/dev.py

@@ -7,6 +7,6 @@

 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"

-INSTALLED_APPS += (
+INSTALLED_APPS += (  # NOQA: F405


This change must be due to the fact that this file hasn't been edited in ages?

Yes. I edited it before I refactored into base.

scottx611x · 2018-02-06T16:12:08Z

refinery/dependency_migrations/chunked_upload/0001_initial.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-


How was this migration created?
Did ./manage.py makemigrations chunked_upload not work?

Btw, we exclude migrations from flake8: https://github.com/refinery-platform/refinery-platform/pull/2568/files

scottx611x · 2018-02-06T18:59:44Z

FWIW while checking out and upgrading my local Django 1.7 instance to this branch I recieved this error during the migration step:

[vagrant@127.0.0.1:2222] run: /vagrant/refinery/manage.py migrate --noinput
[vagrant@127.0.0.1:2222] out: System check identified some issues:
[vagrant@127.0.0.1:2222] out:
[vagrant@127.0.0.1:2222] out: WARNINGS:
[vagrant@127.0.0.1:2222] out: file_server._FileServerItem.data_file: (fields.W342) Setting unique=True on a ForeignKey has the same effect as using a OneToOneField.
[vagrant@127.0.0.1:2222] out: 	HINT: ForeignKey(unique=True) is usually better served by a OneToOneField.
[vagrant@127.0.0.1:2222] out: tool_manager.FileRelationship.file_relationship: (fields.W340) null has no effect on ManyToManyField.
[vagrant@127.0.0.1:2222] out: Operations to perform:
[vagrant@127.0.0.1:2222] out:   Synchronize unmigrated apps: djangular, visualization_manager, staticfiles, admindocs, django_markwhat, messages, rest_framework_swagger, humanize, selenium_testing, workflow_manager, django_extensions, rest_framework, haystack, django_docker_engine
[vagrant@127.0.0.1:2222] out:   Apply all migrations: core, annotation_server, chunked_upload, sessions, admin, data_set_manager, tool_manager, registration, djcelery, sites, auth, tastypie, galaxy_connector, contenttypes, file_server, guardian, file_store, flatblocks, httpproxy, analysis_manager
[vagrant@127.0.0.1:2222] out: Synchronizing apps without migrations:
[vagrant@127.0.0.1:2222] out:   Creating tables...
[vagrant@127.0.0.1:2222] out:     Running deferred SQL...
[vagrant@127.0.0.1:2222] out:   Installing custom SQL...
[vagrant@127.0.0.1:2222] out: Running migrations:
[vagrant@127.0.0.1:2222] out:   Rendering model states... DONE
[vagrant@127.0.0.1:2222] out:   Applying contenttypes.0002_remove_content_type_name... OK
[vagrant@127.0.0.1:2222] out:   Applying auth.0002_alter_permission_name_max_length... OK
[vagrant@127.0.0.1:2222] out:   Applying auth.0003_alter_user_email_max_length... OK
[vagrant@127.0.0.1:2222] out:   Applying auth.0004_alter_user_username_opts... OK
[vagrant@127.0.0.1:2222] out:   Applying auth.0005_alter_user_last_login_null... OK
[vagrant@127.0.0.1:2222] out:   Applying auth.0006_require_contenttypes_0002... OK
[vagrant@127.0.0.1:2222] out:   Applying chunked_upload.0001_initial...Traceback (most recent call last):
[vagrant@127.0.0.1:2222] out:   File "/vagrant/refinery/manage.py", line 10, in <module>
[vagrant@127.0.0.1:2222] out:     execute_from_command_line(sys.argv)
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/core/management/__init__.py", line 354, in execute_from_command_line
[vagrant@127.0.0.1:2222] out:     utility.execute()
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/core/management/__init__.py", line 346, in execute
[vagrant@127.0.0.1:2222] out:     self.fetch_command(subcommand).run_from_argv(self.argv)
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/core/management/base.py", line 394, in run_from_argv
[vagrant@127.0.0.1:2222] out:     self.execute(*args, **cmd_options)
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/core/management/base.py", line 445, in execute
[vagrant@127.0.0.1:2222] out:     output = self.handle(*args, **options)
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/core/management/commands/migrate.py", line 222, in handle
[vagrant@127.0.0.1:2222] out:     executor.migrate(targets, plan, fake=fake, fake_initial=fake_initial)
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/db/migrations/executor.py", line 110, in migrate
[vagrant@127.0.0.1:2222] out:     self.apply_migration(states[migration], migration, fake=fake, fake_initial=fake_initial)
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/db/migrations/executor.py", line 148, in apply_migration
[vagrant@127.0.0.1:2222] out:     state = migration.apply(state, schema_editor)
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/db/migrations/migration.py", line 115, in apply
[vagrant@127.0.0.1:2222] out:     operation.database_forwards(self.app_label, schema_editor, old_state, project_state)
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/db/migrations/operations/models.py", line 59, in database_forwards
[vagrant@127.0.0.1:2222] out:     schema_editor.create_model(model)
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/db/backends/base/schema.py", line 286, in create_model
[vagrant@127.0.0.1:2222] out:     self.execute(sql, params or None)
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/db/backends/base/schema.py", line 111, in execute
[vagrant@127.0.0.1:2222] out:     cursor.execute(sql, params)
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/db/backends/utils.py", line 79, in execute
[vagrant@127.0.0.1:2222] out:     return super(CursorDebugWrapper, self).execute(sql, params)
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/db/backends/utils.py", line 64, in execute
[vagrant@127.0.0.1:2222] out:     return self.cursor.execute(sql, params)
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/db/utils.py", line 98, in __exit__
[vagrant@127.0.0.1:2222] out:     six.reraise(dj_exc_type, dj_exc_value, traceback)
[vagrant@127.0.0.1:2222] out:   File "/home/vagrant/.virtualenvs/refinery-platform/local/lib/python2.7/site-packages/django/db/backends/utils.py", line 62, in execute
[vagrant@127.0.0.1:2222] out:     return self.cursor.execute(sql)
[vagrant@127.0.0.1:2222] out: django.db.utils.ProgrammingError: relation "chunked_upload_chunkedupload" already exists
[vagrant@127.0.0.1:2222] out:
[vagrant@127.0.0.1:2222] out:

* update redux. * Update method params changed from upgrade * Update flockblock params due to upgrade.

codecov · 2018-02-06T19:58:32Z

Codecov Report

Merging #2533 into jkmarx/django-upgrade-1.8 will increase coverage by 0.01%.
The diff coverage is 46.96%.

@@                      Coverage Diff                      @@
##           jkmarx/django-upgrade-1.8    #2533      +/-   ##
=============================================================
+ Coverage                      53.16%   53.18%   +0.01%     
=============================================================
  Files                            415      413       -2     
  Lines                          28158    27102    -1056     
  Branches                        1240     1240              
=============================================================
- Hits                           14969    14413     -556     
+ Misses                         13189    12689     -500

Impacted Files	Coverage Δ
refinery/core/urls.py	`100% <ø> (ø)`	⬆️
refinery/analysis_manager/utils.py	`83.05% <ø> (+17.97%)`	⬆️
refinery/user_files_manager/tests.py	`100% <ø> (ø)`	⬆️
refinery/analysis_manager/tests.py	`97.58% <ø> (ø)`	⬆️
...tion_server/management/commands/create_taxonomy.py	`0% <0%> (ø)`	⬆️
refinery/core/management/commands/activate_user.py	`0% <0%> (ø)`	⬆️
refinery/data_set_manager/tests.py	`99.76% <100%> (-0.01%)`	⬇️
...pendency_migrations/chunked_upload/0001_initial.py	`100% <100%> (ø)`	⬆️
refinery/selenium_testing/tests.py	`100% <100%> (ø)`	⬆️
refinery/core/tests.py	`99.47% <100%> (-0.07%)`	⬇️
... and 19 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 77fd757...d8e90cd. Read the comment docs.

jkmarx · 2018-02-06T23:44:06Z

@scottx611x Yes, you'd already have a migration locally. The previous versions of django: Changed in Django 1.8: The --fake-initial flag to migrate was added. Previously, Django would always automatically fake-apply initial migrations if it detected that the tables exist. That's why in django 1.8, there's a need for dependencies to keep their migrations. The only app which did not was chunked_upload. There's an open pull request for them to include it... juliomalegria/django-chunked-upload#21

hackdna · 2018-02-07T04:50:58Z

refinery/file_store/models.py

@@ -240,11 +239,9 @@ class FileStoreItem(models.Model):
    import_task_id = UUIDField(auto=False, blank=True)
    # Date created
    created = models.DateTimeField(auto_now_add=True,
-                                   default=timezone.now,
                                   blank=True)


blank=True is not needed either:
"As currently implemented, setting auto_now or auto_now_add to True will cause the field to have editable=False and blank=True set"
https://docs.djangoproject.com/en/1.8/ref/models/fields/#datefield

hackdna · 2018-02-07T04:51:14Z

refinery/file_store/models.py

                                   blank=True)
    # Date updated
    updated = models.DateTimeField(auto_now=True,
-                                   default=timezone.now,
                                   blank=True)


blank=True is not needed either:
"As currently implemented, setting auto_now or auto_now_add to True will cause the field to have editable=False and blank=True set"
https://docs.djangoproject.com/en/1.8/ref/models/fields/#datefield

scottx611x · 2018-02-07T14:50:12Z

@jkmarx Okay, I was more so worried about how this will work on existing instances that we'll need to upgrade. If I understand correctly, we could only use this code if we created a fresh vm?

We'd see this error while bringing up an AWS stack as well since the snapshots we have all encapsulate these faked migrations.

Probably good to think about for the overall 1.8 upgrade, but probably not crucial for this PR.

hackdna · 2018-02-07T17:14:55Z

refinery/core/views.py

@@ -564,6 +563,7 @@ def solr_select(request, core):
    data = request.GET.urlencode()
    try:
        full_response = requests.get(url, params=data)
+        response_dict = json.loads(full_response.content)


Missing error handling for JSON decode errors.

in further inquiry, "is this code even used anymore?" I'll write an issue up.

Fix JSON decode error. We need to retain this method until we update data set search feature

* Swap deprecated method out. * Remove solr_igv dependencies. (#2570) * Remove solr_igv dependencies. * Remove visualization_manager. * Upgrade django storage. (#2571) * Upgrade django storage. * Remove post-css library, unused. (#2574) * Update user/file facet/columns per user request. (#2577) * Remove post-css library, unused. * Update user/file facet/columns per user request. * Remove typo , * Fix typo, double quotes. * Remove space. * Add cell_type to facets. * Fix unit test. * Add missing facets. * Fix cypress test. * Revert to 1.6.0 due to django 1.9 support.

* Upgrade django version to 1.8 * Update workflow_manager httpReponse to jsonReponse. * Add allowed_hosts to dev setting. * Update comment. * Remove conflicting settings, model can only have one of add, add_on, or default. * Update analysis_manager httpReponse to jsonResponse. * Add migrations. * Update module_name with model name. * Refactor. * Upgrade some dependencies for django 1.8 * Revert to minimum dependency upgrade to resolve migration issue. * Update annotation server with jsonResponse. * Update core and data_set_manager apps. * Fix typo. * Update requirements to fix migration issue. * Try release which seperates dependency on User module. * Check to see if chunked-upload is the problem. * Fix bug related to abstract model causing migration to fail for library. * Remove duplicate setting. * Track migration until library updates * Reorder installed apps per redux docs. * Update activate_user with parser. * Fix pep8 in migration. * Remove unit test due to inaccurate scope. * Add mocks to unit test. * Remove unneccessary deletion. * Fix selium unit test errors. * Remove accidently added json * Jkmarx/registration redux upgrade (#2562) * update redux. * Update method params changed from upgrade * Update flockblock params due to upgrade. * Refactor, return_value to inline. * Fix unit test. * Fix mistake using jsonresponse with a str. * Remove typo. * Remove unneeded field. * Chunked_upload migration. * Opt for safer option for jsonResponse. * Fix syntax. * Fix pep8. * Swap deprecated method out. (#2566) * Swap deprecated method out. * Remove solr_igv dependencies. (#2570) * Remove solr_igv dependencies. * Remove visualization_manager. * Upgrade django storage. (#2571) * Upgrade django storage. * Remove post-css library, unused. (#2574) * Update user/file facet/columns per user request. (#2577) * Remove post-css library, unused. * Update user/file facet/columns per user request. * Remove typo , * Fix typo, double quotes. * Remove space. * Add cell_type to facets. * Fix unit test. * Add missing facets. * Fix cypress test. * Revert to 1.6.0 due to django 1.9 support. * Remove unnessary flake8 ignore. * Add json.load exception. * Jkmarx/update httpresponse (#2533) * Update workflow_manager httpReponse to jsonReponse. * Add allowed_hosts to dev setting. * Update comment. * Remove conflicting settings, model can only have one of add, add_on, or default. * Update analysis_manager httpReponse to jsonResponse. * Add migrations. * Update module_name with model name. * Refactor. * Upgrade some dependencies for django 1.8 * Revert to minimum dependency upgrade to resolve migration issue. * Update annotation server with jsonResponse. * Update core and data_set_manager apps. * Fix typo. * Update requirements to fix migration issue. * Try release which seperates dependency on User module. * Check to see if chunked-upload is the problem. * Fix bug related to abstract model causing migration to fail for library. * Remove duplicate setting. * Track migration until library updates * Reorder installed apps per redux docs. * Update activate_user with parser. * Fix pep8 in migration. * Remove unit test due to inaccurate scope. * Add mocks to unit test. * Remove unneccessary deletion. * Fix selium unit test errors. * Remove accidently added json * Jkmarx/registration redux upgrade (#2562) * update redux. * Update method params changed from upgrade * Update flockblock params due to upgrade. * Refactor, return_value to inline. * Fix unit test. * Fix mistake using jsonresponse with a str. * Remove typo. * Remove unneeded field. * Chunked_upload migration. * Opt for safer option for jsonResponse. * Fix syntax. * Fix pep8. * Swap deprecated method out. (#2566) * Swap deprecated method out. * Remove solr_igv dependencies. (#2570) * Remove solr_igv dependencies. * Remove visualization_manager. * Upgrade django storage. (#2571) * Upgrade django storage. * Remove post-css library, unused. (#2574) * Update user/file facet/columns per user request. (#2577) * Remove post-css library, unused. * Update user/file facet/columns per user request. * Remove typo , * Fix typo, double quotes. * Remove space. * Add cell_type to facets. * Fix unit test. * Add missing facets. * Fix cypress test. * Revert to 1.6.0 due to django 1.9 support. * Remove unnessary flake8 ignore. * Add json.load exception. * Jkmarx/remove unused m commands (#2583) * Remove unused management commands. * Remove unused method. * Jkmarx/outparse to argparse (#2584) * Update make_options to add_arguments for optparse/argparse upgrade. * Refactor for easier read. * Jkmarx update deprecated 1 8 items (#2588) * Update config with the new 1.8 setting. * Add comment. * Remove unused template. * Update template related settings. * Update get_template per docs, Context&RequestContext unneeded. * Fix typo in context_processors location update. * Remove duplicate. * Fix added setting. * Add `--fake-initial` to our migrate commands to provide the behavior that Django 1.7 gave by default (#2585) * Update management command, argparse. * Scottx611x/fix management commands (#2606) * Update `set_uo_site_name` to use add_arguments() * Add test coverage * Add test for `add_users_to_public_group` * Add test for user activation * Add test for `import_annotations` * Move for consistency. * Jkmarx/update management command argparse (#2607) * Update management command, argparse. * Move for consistency. * Add tests for `create_workflow_engine` * Add tests for `create_galaxy_instance` * Fix bug related to non-obj.

jkmarx added 26 commits January 24, 2018 08:42

Update workflow_manager httpReponse to jsonReponse.

5f06e02

Add allowed_hosts to dev setting.

ebda65d

Update comment.

a3daf10

Remove conflicting settings, model can only have one of add, add_on, …

39e198e

…or default.

Update analysis_manager httpReponse to jsonResponse.

c84fb24

Add migrations.

b68e726

Update module_name with model name.

d6812a4

Refactor.

4d289fe

Upgrade some dependencies for django 1.8

4464b77

Revert to minimum dependency upgrade to resolve migration issue.

83a6f91

Update annotation server with jsonResponse.

15f1d98

Update core and data_set_manager apps.

90ae2da

Fix typo.

ecd9849

Update requirements to fix migration issue.

5528d8f

Try release which seperates dependency on User module.

26ccf36

Check to see if chunked-upload is the problem.

46ba4db

Fix bug related to abstract model causing migration to fail for library.

7a854bb

Remove duplicate setting.

721dfe6

Track migration until library updates

740531e

Reorder installed apps per redux docs.

5f79419

Update activate_user with parser.

5d42882

Fix pep8 in migration.

ff912e4

Remove unit test due to inaccurate scope.

e11c1f8

Add mocks to unit test.

bee52c4

Remove unneccessary deletion.

9ff9032

Fix selium unit test errors.

3e1c4eb

jkmarx commented Feb 6, 2018

View reviewed changes

Remove accidently added json

2f4316f

mccalluc approved these changes Feb 6, 2018

View reviewed changes

scottx611x reviewed Feb 6, 2018

View reviewed changes

jkmarx and others added 2 commits February 6, 2018 14:33

Jkmarx/registration redux upgrade (#2562)

8166553

* update redux. * Update method params changed from upgrade * Update flockblock params due to upgrade.

Refactor, return_value to inline.

d1e00b1

jkmarx added 3 commits February 6, 2018 18:01

Fix unit test.

39ba7e9

Fix mistake using jsonresponse with a str.

404345c

Remove typo.

5e67bd2

hackdna reviewed Feb 7, 2018

View reviewed changes

jkmarx added 5 commits February 7, 2018 08:06

Remove unneeded field.

428839c

Chunked_upload migration.

7a5fc77

Opt for safer option for jsonResponse.

6eeeb75

Fix syntax.

f712ca4

Fix pep8.

6801aa0

hackdna reviewed Feb 7, 2018

View reviewed changes

jkmarx and others added 3 commits February 8, 2018 22:53

Remove unnessary flake8 ignore.

2f91446

Add json.load exception.

d8e90cd

jkmarx merged commit 6293e63 into jkmarx/django-upgrade-1.8 Feb 12, 2018

jkmarx deleted the jkmarx/update-httpresponse branch February 12, 2018 12:45

Jkmarx/update httpresponse #2533

Jkmarx/update httpresponse #2533

Conversation

jkmarx commented Jan 24, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mccalluc left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

scottx611x commented Feb 6, 2018

codecov bot commented Feb 6, 2018 • edited

Codecov Report

jkmarx commented Feb 6, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

scottx611x commented Feb 7, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jkmarx Feb 7, 2018 • edited

Choose a reason for hiding this comment

jkmarx commented Jan 24, 2018 •

edited

codecov bot commented Feb 6, 2018 •

edited

jkmarx commented Feb 6, 2018 •

edited

jkmarx Feb 7, 2018 •

edited