Skip to content

Commit

Permalink
revert to djangorestframework==2.4.8
Browse files Browse the repository at this point in the history
  • Loading branch information
higs4281 committed Aug 25, 2016
1 parent 5a8bbf2 commit b9fbbbf
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 24 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
All notable changes to this project will be documented in this file.
We follow the [Semantic Versioning 2.0.0](http://semver.org/) format.

## 2.2.2
- Switch to djangorestframework==2.4.8 to match servers

## 2.2.1
- Added model function for exporting program as CSV
- Added management command for purging test programs
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "college-costs",
"version": "2.2.1",
"version": "2.2.2",
"description": "Tools to help students make informed financial decisions about college.",
"homepage": "http://www.github.com/cfpb/college-costs/",
"author": {
Expand Down
42 changes: 21 additions & 21 deletions paying_for_college/disclosures/scripts/load_programs.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,28 @@
class ProgramSerializer(serializers.Serializer):

ipeds_unit_id = serializers.CharField(max_length=6) # '210960'
ope_id = serializers.CharField(max_length=8, allow_blank=True) # '747000'
campus_name = serializers.CharField(allow_blank=True) # 'Ai Pittsburgh'
ope_id = serializers.CharField(max_length=8, required=False) # '747000'
campus_name = serializers.CharField(required=False) # 'Ai Pittsburgh'
program_code = serializers.CharField() # '44'
program_name = serializers.CharField(allow_blank=True) # 'Hotel & Restaurant Management'
program_level = serializers.IntegerField(allow_null=True) # 3 @TODO: Should this by Char? Choice?
program_length = serializers.IntegerField(allow_null=True) # 24
accreditor = serializers.CharField(allow_blank=True) # ''
median_salary = serializers.IntegerField(allow_null=True) # 31240
average_time_to_complete = serializers.IntegerField(allow_null=True) # 36
books_supplies = serializers.IntegerField(allow_null=True) # 2600
completion_rate = serializers.FloatField(allow_null=True) # 0.29
default_rate = serializers.FloatField(allow_null=True) # 0.23
job_placement_rate = serializers.FloatField(allow_null=True) # 0.7
job_placement_note = serializers.CharField(allow_blank=True) # 'optional note'
mean_student_loan_completers = serializers.IntegerField(allow_null=True) # 34000
median_student_loan_completers = serializers.IntegerField(allow_null=True) # 45857
total_cost = serializers.IntegerField(allow_null=True) # 91004
tuition_fees = serializers.IntegerField(allow_null=True) # 88404
cip_code = serializers.CharField(allow_blank=True) # '12.0504'
# soc_codes = serializers.CharField(allow_blank=True) # '35-1011, 35-1012'
completers = serializers.IntegerField(allow_null=True)
completion_cohort = serializers.IntegerField(allow_null=True)
program_name = serializers.CharField(required=False) # 'Hotel & Restaurant Management'
program_level = serializers.IntegerField(required=False) # 3 @TODO: Should this by Char? Choice?
program_length = serializers.IntegerField(required=False) # 24
accreditor = serializers.CharField(required=False) # ''
median_salary = serializers.IntegerField(required=False) # 31240
average_time_to_complete = serializers.IntegerField(required=False) # 36
books_supplies = serializers.IntegerField(required=False) # 2600
completion_rate = serializers.FloatField(required=False) # 0.29
default_rate = serializers.FloatField(required=False) # 0.23
job_placement_rate = serializers.FloatField(required=False) # 0.7
job_placement_note = serializers.CharField(required=False) # 'optional note'
mean_student_loan_completers = serializers.IntegerField(required=False) # 34000
median_student_loan_completers = serializers.IntegerField(required=False) # 45857
total_cost = serializers.IntegerField(required=False) # 91004
tuition_fees = serializers.IntegerField(required=False) # 88404
cip_code = serializers.CharField(required=False) # '12.0504'
# soc_codes = serializers.CharField(required=False) # '35-1011, 35-1012'
completers = serializers.IntegerField(required=False)
completion_cohort = serializers.IntegerField(required=False)


def get_school(iped):
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ python-dateutil==2.2
PyYAML==3.11
elasticsearch==2.3.0
csvkit==0.9.1
djangorestframework==3.3.3
djangorestframework==2.4.8
six==1.10.0
boto==2.38.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def run(self):

setup(
name='college-costs',
version='2.2.1',
version='2.2.2',
author='CFPB',
author_email='tech@cfpb.gov',
maintainer='cfpb',
Expand Down

0 comments on commit b9fbbbf

Please sign in to comment.