conntrackt Changeset - 2f79a5b24a36

Changeset - 2f79a5b24a36

Parent rev.

Child rev.

[Not reviewed]

default

0 6 1

Branko Majic (branko) - 6 years ago 2017-12-21 15:24:15
branko@majic.rs

CONNT-25: Updating application and project to use Django 1.8.x:

- Switched to using GenericIPAddress instead of IPAddress in models.
- Updated setup script and development requirements to use Django
1.8.x.
- Updated release notes.

7 files changed with 32 insertions and 8 deletions:

conntrackt/migrations/0002_auto_20171221_1513.py

conntrackt/models.py

docs/releasenotes.rst

requirements/base.in

requirements/development.txt

requirements/test.txt

setup.py

0 comments (0 inline, 0 general)

conntrackt/migrations/0002_auto_20171221_1513.py

➞

Show inline comments

@@ new file 100644 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 from django.db import migrations, models
 class Migration(migrations.Migration):
     dependencies = [
         ('conntrackt', '0001_initial'),
+    ]
     operations = [
         migrations.AlterField(
             model_name='interface',
             name='address',
             field=models.GenericIPAddressField(),
         ),
         migrations.AlterField(
             model_name='interface',
             name='netmask',
             field=models.GenericIPAddressField(default=b'255.255.255.255'),
         ),
+    ]

conntrackt/models.py

➞

Show inline comments

@@ @@ -17,13 +17,13 @@ @@
 # You should have received a copy of the GNU General Public License along with
 # Django Conntrackt.  If not, see <http://www.gnu.org/licenses/>.
+#
 # Django imports.
-from django.contrib.admin.util import NestedObjects
+from django.contrib.admin.utils import NestedObjects
 from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models.query_utils import Q
 # Application imports.
@@ @@ -343,14 +343,14 @@ class Interface(RelatedCollectorMixin, m @@
       denoting the network netmask.
     """
     name = models.CharField(max_length=100, default='eth0')
     description = models.TextField(blank=True, default='Main network interface.')
     entity = models.ForeignKey(Entity)
     address = models.IPAddressField()
     netmask = models.IPAddressField(default='255.255.255.255')
     address = models.GenericIPAddressField()
     netmask = models.GenericIPAddressField(default='255.255.255.255')
     class Meta:
         # Enforce uniqueness of interface name in an entity. Enforce uniqueness
         # of IP address in a subnet for an entity.
         unique_together = (("name", "entity"),
                            ("entity", "address", "netmask"),)

docs/releasenotes.rst

➞

Show inline comments

@@ @@ -14,13 +14,13 @@ Release Notes @@
 dev
 ---
 Breaking changes:
-* Django Conntrackt now depends on Django 1.7. In addition to official
+* Django Conntrackt now depends on Django 1.8. In addition to official
   Django documentation, there is a dedicated upgrade guide that deals
   with the most basic installation.
   [ `CONNT-25 <https://projects.majic.rs/conntrackt/issues/CONNT-30>`_ ]
 New features/improvements:

requirements/base.in

➞

Show inline comments

@@ @@ -21,13 +21,13 @@ @@
 django-braces~=1.12.0
 # Convenience tools for controlling rendering of forms while embracing DRY.
 django-crispy-forms~=1.6.0
 # Web framework used by application.
-django~=1.7.0
+django~=1.8.0
 # Library for programatic calculation of colours (contrasts,
 # inversions etc).
 palette~=0.2.0
 # Interaface towards Graphviz for chart generation.

requirements/development.txt

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ alabaster==0.7.10 # via sphinx @@
 babel==2.5.1              # via sphinx
 certifi==2017.11.5        # via requests
 chardet==3.0.4            # via requests
 coverage==4.4.2
 django-braces==1.12.0
 django-crispy-forms==1.6.1
-django==1.7.11
+django==1.8.18
 docutils==0.14            # via sphinx
 factory-boy==2.1.2
 funcsigs==1.0.2           # via mock
 idna==2.6                 # via requests
 imagesize==0.7.1          # via sphinx
 jinja2==2.10              # via sphinx

requirements/test.txt

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ alabaster==0.7.10 # via sphinx @@
 babel==2.5.1              # via sphinx
 certifi==2017.11.5        # via requests
 chardet==3.0.4            # via requests
 coverage==4.4.2
 django-braces==1.12.0
 django-crispy-forms==1.6.1
-django==1.7.11
+django==1.8.18
 docutils==0.14            # via sphinx
 factory-boy==2.1.2
 funcsigs==1.0.2           # via mock
 idna==2.6                 # via requests
 imagesize==0.7.1          # via sphinx
 jinja2==2.10              # via sphinx

setup.py

➞

Show inline comments

@@ @@ -23,13 +23,13 @@ import os @@
 from setuptools import setup, find_packages
 README = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
 INSTALL_REQUIREMENTS = [
     "django-braces~=1.12.0",
     "django-crispy-forms~=1.6.0",
-    "django~=1.7.0",
+    "django~=1.8.0",
     "palette~=0.2.0",
     "pydot~=1.2.0",
+]
 # allow setup.py to be run from any path
 os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))

0 comments (0 inline, 0 general)