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

Jump to bottom

Scottx611x/django 1.6 upgrade #886

Merged
merged 29 commits into from Feb 18, 2016
Merged

Scottx611x/django 1.6 upgrade #886

merged 29 commits into from Feb 18, 2016

Conversation

scottx611x
Copy link
Member

Related Issues:
#589
#612

@scottx611x
Upgrade Django to 1.6.11
4343807
@scottx611x
Remove deprecated 'django.contrib.markup' and it's usages
c946040
@scottx611x
Revert "Remove deprecated 'django.contrib.markup' and it's usages"
dd997d6 
This reverts commit c946040.
@scottx611x
Install django_markwhat as a drop-in for deprecated `django.contrib…
23595a4 
….markup`

See: https://docs.djangoproject.com/en/dev/releases/1.5/#django-contrib-markup
@scottx611x
Replace deprecated django.conf.urls.defaults with django.conf.urls
77478e8
@scottx611x
Update django-tastypie to 0.12.2 (Supports Django 1.6)
9524afd
@scottx611x
Upgrade South
b040d1a
@scottx611x
Downgrade South
de6a4c8
@scottx611x
Revert "Downgrade South"
06e62b3 
This reverts commit de6a4c8.
@scottx611x
Update django-guardian to v. that supports Django 1.6
eea5b4f
@scottx611x
Downgrade Django from 1.6.11 to 1.6 because things are breaking
debfbb4
@scottx611x
Upgrade to Django 1.6.3 because djangorestframework 3.2.5 only su…
f99e9bd 
…pports `Django 1.6.3+`
@scottx611x
Upgrade to Django 1.6.7
64b944b
@scottx611x
Replace deprecated simplejson with json
57da6b2
@scottx611x
Upgrade to Django 1.6.11
5c7686a
@scottx611x
Remove all usages of simplejson
1548f6c 
It has been deprecated since `Django 1.5`: goo.gl/kTSCco
@scottx611x
Merge branch 'develop' of https://github.com/parklab/refinery-platform …
cc2648e 
…into scottx611x/django_1.6_upgrade
@scottx611x
Merge branch 'develop' of https://github.com/parklab/refinery-platform …
149f025 
…into scottx611x/django_1.6_upgrade
@scottx611x
Remove simplejson from comments
0c6ef29
@scottx611x
Use auto commit instead of deprecated commit_manually
191c20a
@scottx611x
Explicitly setting the status field in bundle allows `Analysis stat…
c0c8407 
…us` to work properly
@scottx611x
Remove the is_implicit fields I added as this masked the actual err…
4b2342d 
…or at hand
@scottx611x
Change back auto commit to commit_manually as the real issue may …
c4cc86b 
…be with the v. of `tastypie`
@scottx611x
Fix use_in param only providing fields to tasty pie detail view
62c9a55
@scottx611x
Add fields list back
1504359
@scottx611x
Remove explicit definition of status field
3526590
@scottx611x
Remove check for Datsets used in analyses upon deletion
00b37e6
@scottx611x
Add default value for is_implicit according to changes in Django 1.6
38ac0c9
@scottx611x
Add defaults in api
611cc3a
@scottx611x scottx611x self-assigned this Feb 16, 2016
@scottx611x scottx611x added this to the Oak Bluffs milestone Feb 16, 2016
@codecov-io
Copy link

Current coverage is 20.89%

Merging #886 into develop will decrease coverage by -0.08% as of 0ae986d

@@            develop    #886   diff @@
=======================================
  Files           211     211       
  Stmts         17819   17814     -5
  Branches       1021    1021       
  Methods                           
=======================================
- Hit            3737    3722    -15
  Partial           0       0       
- Missed        14082   14092    +10

Review entire Coverage Diff as of 0ae986d

Powered by Codecov. Updated on successful CI builds.

hackdna added a commit that referenced this pull request Feb 18, 2016
@hackdna
Merge pull request #886 from parklab/scottx611x/django_1.6_upgrade
a4eb092 
Scottx611x/django 1.6 upgrade
@hackdna hackdna merged commit a4eb092 into develop Feb 18, 2016
@scottx611x scottx611x deleted the scottx611x/django_1.6_upgrade branch February 18, 2016 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@scottx611x scottx611x

Labels
important server technical debt
Projects
None yet
Milestone
Oak Bluffs
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@scottx611x @codecov-io @hackdna