From 21a4725b923565dd67219317062c02b652207880 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 29 Mar 2014 11:00:23 -0500 Subject: Bump django-countries and pytz requirements --- requirements_prod.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'requirements_prod.txt') diff --git a/requirements_prod.txt b/requirements_prod.txt index 840e0396..e773bb4c 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -4,10 +4,10 @@ IPy==0.81 Markdown==2.4 South==0.8.4 bencode==1.0 -django-countries==2.0 +django-countries==2.1.2 jsmin==2.0.9 pgpdump==1.5 psycopg2==2.5.2 pyinotify==0.9.4 python-memcached==1.53 -pytz>=2013.8 +pytz>=2014.2 -- cgit v1.2.3-54-g00ecf From dbe0ae1a77ae601b7c413a534eca7cf7118be8b3 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 22 Apr 2014 15:38:46 -0500 Subject: Bump Django version Signed-off-by: Dan McGee --- requirements.txt | 2 +- requirements_prod.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'requirements_prod.txt') diff --git a/requirements.txt b/requirements.txt index 0b5ecb64..30cf352a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.6.2 +Django==1.6.3 IPy==0.81 Markdown==2.4 South==0.8.4 diff --git a/requirements_prod.txt b/requirements_prod.txt index e773bb4c..038e4183 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -1,5 +1,5 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.6.2 +Django==1.6.3 IPy==0.81 Markdown==2.4 South==0.8.4 -- cgit v1.2.3-54-g00ecf From fa5414a72ac866a3162e74970427aeaaf8134cce Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 29 Apr 2014 09:19:29 -0500 Subject: Bump Django version, again Signed-off-by: Dan McGee --- requirements.txt | 2 +- requirements_prod.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'requirements_prod.txt') diff --git a/requirements.txt b/requirements.txt index 30cf352a..3f95a583 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.6.3 +Django==1.6.4 IPy==0.81 Markdown==2.4 South==0.8.4 diff --git a/requirements_prod.txt b/requirements_prod.txt index 038e4183..6df42e81 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -1,5 +1,5 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.6.3 +Django==1.6.4 IPy==0.81 Markdown==2.4 South==0.8.4 -- cgit v1.2.3-54-g00ecf From e660aa18eb7051399fda5fa07f3798c42d6d6de3 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 18 May 2014 21:28:09 -0500 Subject: Bump some requirements Signed-off-by: Dan McGee --- requirements.txt | 4 ++-- requirements_prod.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'requirements_prod.txt') diff --git a/requirements.txt b/requirements.txt index 3f95a583..be29db23 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.6.4 +Django==1.6.5 IPy==0.81 Markdown==2.4 South==0.8.4 @@ -7,4 +7,4 @@ bencode==1.0 django-countries==2.1.2 jsmin==2.0.9 pgpdump==1.5 -pytz>=2014.2 +pytz>=2014.3 diff --git a/requirements_prod.txt b/requirements_prod.txt index 6df42e81..8d1aeb9c 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -1,5 +1,5 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.6.4 +Django==1.6.5 IPy==0.81 Markdown==2.4 South==0.8.4 @@ -7,7 +7,7 @@ bencode==1.0 django-countries==2.1.2 jsmin==2.0.9 pgpdump==1.5 -psycopg2==2.5.2 +psycopg2==2.5.3 pyinotify==0.9.4 python-memcached==1.53 -pytz>=2014.2 +pytz>=2014.3 -- cgit v1.2.3-54-g00ecf From be4b9dc36338b57ad8b78491ef31cb91fbde9335 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 31 May 2014 15:13:58 -0500 Subject: Bump markdown requirement version Signed-off-by: Dan McGee --- requirements.txt | 2 +- requirements_prod.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'requirements_prod.txt') diff --git a/requirements.txt b/requirements.txt index be29db23..4de9aeec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin Django==1.6.5 IPy==0.81 -Markdown==2.4 +Markdown==2.4.1 South==0.8.4 bencode==1.0 django-countries==2.1.2 diff --git a/requirements_prod.txt b/requirements_prod.txt index 8d1aeb9c..38f96f72 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -1,7 +1,7 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin Django==1.6.5 IPy==0.81 -Markdown==2.4 +Markdown==2.4.1 South==0.8.4 bencode==1.0 django-countries==2.1.2 -- cgit v1.2.3-54-g00ecf From 45f5ba71e76128bb266f6621b7eaec71af19ed2b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 28 Jun 2014 11:56:27 -0500 Subject: Bump some requirements Signed-off-by: Dan McGee --- requirements.txt | 4 ++-- requirements_prod.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'requirements_prod.txt') diff --git a/requirements.txt b/requirements.txt index 4de9aeec..317e800c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,6 @@ Markdown==2.4.1 South==0.8.4 bencode==1.0 django-countries==2.1.2 -jsmin==2.0.9 +jsmin==2.0.11 pgpdump==1.5 -pytz>=2014.3 +pytz>=2014.4 diff --git a/requirements_prod.txt b/requirements_prod.txt index 38f96f72..a4e338b4 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -5,9 +5,9 @@ Markdown==2.4.1 South==0.8.4 bencode==1.0 django-countries==2.1.2 -jsmin==2.0.9 +jsmin==2.0.11 pgpdump==1.5 psycopg2==2.5.3 pyinotify==0.9.4 python-memcached==1.53 -pytz>=2014.3 +pytz>=2014.4 -- cgit v1.2.3-54-g00ecf From 2382c55c435af9ab7d7ce3bd71abda5b2a2928b5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 1 Sep 2014 15:34:23 -0500 Subject: Requirements bumping Signed-off-by: Dan McGee --- requirements.txt | 6 +++--- requirements_prod.txt | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'requirements_prod.txt') diff --git a/requirements.txt b/requirements.txt index 317e800c..a27bd35a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.6.5 +Django==1.6.6 IPy==0.81 Markdown==2.4.1 -South==0.8.4 +South==1.0 bencode==1.0 django-countries==2.1.2 jsmin==2.0.11 pgpdump==1.5 -pytz>=2014.4 +pytz>=2014.7 diff --git a/requirements_prod.txt b/requirements_prod.txt index a4e338b4..a26ef54a 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -1,13 +1,13 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.6.5 +Django==1.6.6 IPy==0.81 Markdown==2.4.1 -South==0.8.4 +South==1.0 bencode==1.0 django-countries==2.1.2 jsmin==2.0.11 pgpdump==1.5 -psycopg2==2.5.3 +psycopg2==2.5.4 pyinotify==0.9.4 python-memcached==1.53 -pytz>=2014.4 +pytz>=2014.7 -- cgit v1.2.3-54-g00ecf From 345d756b889426723c63e0aee8a445df6573cd65 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 23 Aug 2014 22:18:56 -0500 Subject: Update to a version of django-countries compatible with 1.7 Signed-off-by: Dan McGee --- requirements.txt | 2 +- requirements_prod.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'requirements_prod.txt') diff --git a/requirements.txt b/requirements.txt index a27bd35a..1888f8a1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin +-e git+git://github.com/SmileyChris/django-countries.git@a2c924074dbe2f0b9b3059bf70064aeadf5643ed#egg=django-countries Django==1.6.6 IPy==0.81 Markdown==2.4.1 South==1.0 bencode==1.0 -django-countries==2.1.2 jsmin==2.0.11 pgpdump==1.5 pytz>=2014.7 diff --git a/requirements_prod.txt b/requirements_prod.txt index a26ef54a..c6b06897 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -1,10 +1,10 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin +-e git+git://github.com/SmileyChris/django-countries.git@a2c924074dbe2f0b9b3059bf70064aeadf5643ed#egg=django-countries Django==1.6.6 IPy==0.81 Markdown==2.4.1 South==1.0 bencode==1.0 -django-countries==2.1.2 jsmin==2.0.11 pgpdump==1.5 psycopg2==2.5.4 -- cgit v1.2.3-54-g00ecf From 5232b186dc44fc053adfcbd3860a4b33da399232 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 28 Jun 2014 12:22:29 -0500 Subject: Remove dependency on South Signed-off-by: Dan McGee --- README.md | 1 - devel/fields.py | 2 -- main/fields.py | 2 -- mirrors/fields.py | 4 ---- requirements.txt | 1 - requirements_prod.txt | 1 - settings.py | 1 - 7 files changed, 12 deletions(-) (limited to 'requirements_prod.txt') diff --git a/README.md b/README.md index beeb7f99..3e48ca8c 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ packages, you will probably want the following: - django - python2-psycopg2 - python2-markdown -- python2-south - python2-memcached # Testing Installation diff --git a/devel/fields.py b/devel/fields.py index 606ca63c..dd22a92e 100644 --- a/devel/fields.py +++ b/devel/fields.py @@ -3,8 +3,6 @@ class PGPKeyField(models.CharField): - _south_introspects = True - def __init__(self, *args, **kwargs): super(PGPKeyField, self).__init__(*args, **kwargs) self.validators.append(RegexValidator(r'^[0-9A-F]{40}$', diff --git a/main/fields.py b/main/fields.py index 2d5703ef..53494772 100644 --- a/main/fields.py +++ b/main/fields.py @@ -2,8 +2,6 @@ class PositiveBigIntegerField(models.BigIntegerField): - _south_introspects = True - def get_internal_type(self): return "BigIntegerField" diff --git a/mirrors/fields.py b/mirrors/fields.py index 206c9d7d..e8963edf 100644 --- a/mirrors/fields.py +++ b/mirrors/fields.py @@ -4,7 +4,6 @@ from django.core import validators from django.core.exceptions import ValidationError from django.db import models -from south.modelsinspector import add_introspection_rules class IPNetworkFormField(forms.Field): @@ -44,6 +43,3 @@ def formfield(self, **kwargs): defaults = {'form_class': IPNetworkFormField} defaults.update(kwargs) return super(IPNetworkField, self).formfield(**defaults) - - -add_introspection_rules([], ["^mirrors\.fields\.IPNetworkField"]) diff --git a/requirements.txt b/requirements.txt index 1888f8a1..866b4f52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,6 @@ Django==1.6.6 IPy==0.81 Markdown==2.4.1 -South==1.0 bencode==1.0 jsmin==2.0.11 pgpdump==1.5 diff --git a/requirements_prod.txt b/requirements_prod.txt index c6b06897..d98a7daa 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -3,7 +3,6 @@ Django==1.6.6 IPy==0.81 Markdown==2.4.1 -South==1.0 bencode==1.0 jsmin==2.0.11 pgpdump==1.5 diff --git a/settings.py b/settings.py index 2e3cf08b..368dcb73 100644 --- a/settings.py +++ b/settings.py @@ -114,7 +114,6 @@ 'django.contrib.sitemaps', 'django.contrib.admin', 'django.contrib.staticfiles', - 'south', 'django_countries', 'main', -- cgit v1.2.3-54-g00ecf From 1173be8b91910ebc82b9b7e5c8e0aaa5af811daf Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 2 Sep 2014 20:09:59 -0500 Subject: Bump Django requirement to 1.7 Signed-off-by: Dan McGee --- requirements.txt | 2 +- requirements_prod.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'requirements_prod.txt') diff --git a/requirements.txt b/requirements.txt index 866b4f52..eff75bad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -e git+git://github.com/SmileyChris/django-countries.git@a2c924074dbe2f0b9b3059bf70064aeadf5643ed#egg=django-countries -Django==1.6.6 +Django==1.7 IPy==0.81 Markdown==2.4.1 bencode==1.0 diff --git a/requirements_prod.txt b/requirements_prod.txt index d98a7daa..fc97b654 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -1,6 +1,6 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -e git+git://github.com/SmileyChris/django-countries.git@a2c924074dbe2f0b9b3059bf70064aeadf5643ed#egg=django-countries -Django==1.6.6 +#Django==1.7 IPy==0.81 Markdown==2.4.1 bencode==1.0 -- cgit v1.2.3-54-g00ecf From b041219dec90b39151278e5c786b4211d65a6ac7 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 11 Sep 2014 18:34:02 -0500 Subject: Whoops, this shouldn't be commented out Signed-off-by: Dan McGee --- requirements_prod.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'requirements_prod.txt') diff --git a/requirements_prod.txt b/requirements_prod.txt index fc97b654..c181c3af 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -1,6 +1,6 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -e git+git://github.com/SmileyChris/django-countries.git@a2c924074dbe2f0b9b3059bf70064aeadf5643ed#egg=django-countries -#Django==1.7 +Django==1.7 IPy==0.81 Markdown==2.4.1 bencode==1.0 -- cgit v1.2.3-54-g00ecf