Skip to content

Loading…

requirements updated to provide Django 1.4.5 (and other) #185

Merged
merged 2 commits into from

2 participants

@zalun
Mozilla member

The only errors on my localhost are related to search which is fine

@seanmonstar
Mozilla member

do we even use requirements anymore? I thought it was all in vendor.

@zalun
Mozilla member

You're right - I will make it to the vendor then

@zalun zalun vendor updated
fixtures fixed (there were issues which got catched on udpated Django)
26f9904
@seanmonstar seanmonstar merged commit 74f2ba2 into mozilla:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 21, 2013
  1. @zalun
Commits on Feb 25, 2013
  1. @zalun

    vendor updated

    zalun committed
    fixtures fixed (there were issues which got catched on udpated Django)
View
18 apps/jetpack/fixtures/core_sdk.json
@@ -1,6 +1,24 @@
[
{
"pk": 1,
+ "model": "auth.user",
+ "fields": {
+ "username": "4757633",
+ "first_name": "Mozilla",
+ "last_name": "",
+ "is_active": true,
+ "is_superuser": false,
+ "is_staff": false,
+ "last_login": "2010-09-27 05:55:09",
+ "groups": [],
+ "user_permissions": [],
+ "password": "sha1$14b06$3c244f8f492bed0b142d098806d83e1376e5d121",
+ "email": "mozilla@example.com",
+ "date_joined": "2010-09-27 05:55:09"
+ }
+ },
+ {
+ "pk": 1,
"model": "person.profile",
"fields": {
"nickname": null,
View
3 apps/jetpack/fixtures/old_packages.json
@@ -14,6 +14,8 @@
"type": "a",
"public_permission": 1,
"description": "",
+ "created_at": "2010-09-27 12:39:38",
+ "last_update": "2010-09-27 12:40:00",
"latest": 401
}
},
@@ -32,6 +34,7 @@
"dependencies": [],
"version_name": null,
"message": "",
+ "created_at": "2010-09-27 12:39:38",
"sdk": null
}
}
View
46 apps/jetpack/fixtures/packages.json
@@ -14,7 +14,7 @@
"program_id": "jid0-YZCBIaXmLoQMBbL1fBzvOy5rFZk@jetpack",
"last_update": "2010-09-27 12:40:00",
"url": "",
- "version": 5,
+ "version": 205,
"full_name": "Test Addon",
"active": true,
"version_name": "initial",
@@ -40,7 +40,7 @@
"program_id": null,
"last_update": "2010-09-27 12:35:27",
"url": "",
- "version": 3,
+ "version": 203,
"full_name": "Test Library",
"active": true,
"version_name": "initial",
@@ -66,7 +66,7 @@
"program_id": "jid0-ut6xorB6IZ7gMePg9E6gm9TwIgI@jetpack",
"last_update": "2010-09-27 12:34:07",
"url": "",
- "version": 2,
+ "version": 202,
"full_name": "Test Addon",
"active": true,
"version_name": "initial",
@@ -78,10 +78,29 @@
}
},
{
+ "pk": 203,
+ "model": "jetpack.packagerevision",
+ "fields": {
+ "origin": null,
+ "contributors": "",
+ "author": 3,
+ "created_at": "2010-09-27 12:34:25",
+ "package": 203,
+ "full_name": "Test Library",
+ "name": "test-library",
+ "module_main": "index",
+ "revision_number": 0,
+ "dependencies": [],
+ "version_name": "initial",
+ "message": "",
+ "sdk": null
+ }
+ },
+ {
"pk": 204,
"model": "jetpack.packagerevision",
"fields": {
- "origin": 3,
+ "origin": 203,
"contributors": "",
"name": "test-library",
"full_name": "Test Library",
@@ -116,25 +135,6 @@
}
},
{
- "pk": 203,
- "model": "jetpack.packagerevision",
- "fields": {
- "origin": null,
- "contributors": "",
- "author": 3,
- "created_at": "2010-09-27 12:34:25",
- "package": 203,
- "full_name": "Test Library",
- "name": "test-library",
- "module_main": "index",
- "revision_number": 0,
- "dependencies": [],
- "version_name": "initial",
- "message": "",
- "sdk": null
- }
- },
- {
"pk": 205,
"model": "jetpack.packagerevision",
"fields": {
View
2 apps/jetpack/tests/folders_tests.py
@@ -19,7 +19,7 @@ def newest(revision):
.order_by('-revision_number')[:1])[0]
class FolderTest(TestCase):
- fixtures = ['mozilla_user', 'users', 'packages']
+ fixtures = ['mozilla_user', 'users', 'core_sdk', 'packages']
def setUp(self):
self.author = User.objects.get(username='john')
View
8 requirements/compiled.txt
@@ -1,7 +1,7 @@
# These libraries are required to run the site, but need to compile themselves
# so we can't distribute them with flightdeck-lib
-MySQL-python==1.2.3c1
-simplejson==2.1.1
-lxml==2.3
-Jinja2==2.5.5
+MySQL-python==1.2.4
+simplejson==3.0.8
+lxml==3.1.0
+Jinja2==2.6
View
18 requirements/development.txt
@@ -3,22 +3,22 @@
# load everything from production
-r production.txt
-django-debug-toolbar
-django-extensions
+django-debug-toolbar>=0.9.4
+django-extensions>=1.0.3
# tests
-e git://github.com/jbalogh/test-utils.git#egg=test-utils
-e git://github.com/jbalogh/django-nose.git#egg=django_nose
-nose==0.11.1
-mock==0.6.0
-pyquery
+nose>=1.2.1
+mock>=1.0.1
+pyquery>=1.2.4
# code quality
-pylint
-coverage
-figleaf
+pylint>=0.26.0
+coverage>=3.6
+figleaf>=0.6.1
# check before commit
-e git://github.com/jbalogh/check.git#egg=check
-Sphinx==0.6.3
+Sphinx>=1.1.3
View
9 requirements/production.txt
@@ -1,6 +1,6 @@
# requirements for production environment
-Django==1.2.5
+Django==1.4.5
# search functionality
-e git://github.com/aparo/pyes#egg=pyes
@@ -12,13 +12,12 @@ Markdown==2.0.3
-e git://github.com/jsocol/commonware.git#egg=commonware
# Celery
-python-dateutil
-django-celery
-importlib
+python-dateutil==2.1
+django-celery==3.0.15
-e git://github.com/mozilla/nuggets.git#egg=nuggets
# Repackage
-rdflib
+rdflib==3.2.3
# features management
-e git://github.com/jsocol/django-waffle.git#egg=waffle
2 vendor
@@ -1 +1 @@
-Subproject commit 5bccd4720b81b6135c06dc773da1cddadfde5ca4
+Subproject commit c9e5405789630c273dca1916b007033bac7f507a
Something went wrong with that request. Please try again.