Merge branch 'hotfix-1.3'

rotationalio · Jul 6, 2016 · 7a02eac · 7a02eac
2 parents cac3d6c + fd1661f
commit 7a02eac
Show file tree

Hide file tree

Showing 15 changed files with 399 additions and 65 deletions.
diff --git a/README.md b/README.md
@@ -114,13 +114,21 @@ The release versions that are sent to the Python package index (PyPI) are also t
 
 The versioning uses a three part version system, "a.b.c" - "a" represents a major release that may not be backwards compatible. "b" is incremented on minor releases that may contain extra features, but are backwards compatible. "c" releases are bug fixes or other micro changes that developers should feel free to immediately update to.
 
+### Version 1.3
+
+* **tag**: [v1.3](https://github.com/DistrictDataLabs/tribe/releases/tag/v1.3)
+* **release**:  Wednesday, July 6, 2016
+* **commit**: [see tag](#)
+
+After some feedback about the length of time it was taking to create the edges in the NetworkX graph, we modified the `FreqDist` object to memoize calls to N, B, and M. This means that on a per edge basis, far fewer complete traversals of the distribution are carried out. Already we have observed minutes worth of performance improvements as a result. The Graph also now carries more information including edge weights by frequency, count, and by L1 norm. The Graph itself carries email count and file size information data alongside other information.
+
 ### Version 1.2
 
 * **tag**: [v1.2](https://github.com/DistrictDataLabs/tribe/releases/tag/v1.2)
 * **release**:  Wednesday, June 22, 2016
-* **commit**: [see tag](#)
+* **commit**: [cac3d6c](https://github.com/DistrictDataLabs/tribe/commit/cac3d6cb3f95e9d114528d9beef5307c16ec7266)
 
-In this release we have improved some of the handling code to make things a bit more robust with students who work on a variety of operating systems. For example we have added a progress indicator so that something appears to be happening on very large mbox files (and you're not left wondering). Additionally we have added better error handling so one bad email doesn't ruin your day. We also made the library Python 2.7 and Python 3.5 compatible with a better test suite. 
+In this release we have improved some of the handling code to make things a bit more robust with students who work on a variety of operating systems. For example we have added a progress indicator so that something appears to be happening on very large mbox files (and you're not left wondering). Additionally we have added better error handling so one bad email doesn't ruin your day. We also made the library Python 2.7 and Python 3.5 compatible with a better test suite.
 
 ### Version 1.1.2
 

diff --git a/docs/about.md b/docs/about.md
@@ -47,13 +47,21 @@ The release versions that are sent to the Python package index (PyPI) are also t
 
 The versioning uses a three part version system, "a.b.c" - "a" represents a major release that may not be backwards compatible. "b" is incremented on minor releases that may contain extra features, but are backwards compatible. "c" releases are bug fixes or other micro changes that developers should feel free to immediately update to.
 
+### Version 1.3
+
+* **tag**: [v1.3](https://github.com/DistrictDataLabs/tribe/releases/tag/v1.3)
+* **release**:  Wednesday, July 6, 2016
+* **commit**: [see tag](#)
+
+After some feedback about the length of time it was taking to create the edges in the NetworkX graph, we modified the `FreqDist` object to memoize calls to N, B, and M. This means that on a per edge basis, far fewer complete traversals of the distribution are carried out. Already we have observed minutes worth of performance improvements as a result. The Graph also now carries more information including edge weights by frequency, count, and by L1 norm. The Graph itself carries email count and file size information data alongside other information. 
+
 ### Version 1.2
 
 * **tag**: [v1.2](https://github.com/DistrictDataLabs/tribe/releases/tag/v1.2)
 * **release**:  Wednesday, June 22, 2016
-* **commit**: [see tag](#)
+* **commit**:  [cac3d6c](https://github.com/DistrictDataLabs/tribe/commit/cac3d6cb3f95e9d114528d9beef5307c16ec7266)
 
-In this release we have improved some of the handling code to make things a bit more robust with students who work on a variety of operating systems. For example we have added a progress indicator so that something appears to be happening on very large mbox files (and you're not left wondering). Additionally we have added better error handling so one bad email doesn't ruin your day. We also made the library Python 2.7 and Python 3.5 compatible with a better test suite. 
+In this release we have improved some of the handling code to make things a bit more robust with students who work on a variety of operating systems. For example we have added a progress indicator so that something appears to be happening on very large mbox files (and you're not left wondering). Additionally we have added better error handling so one bad email doesn't ruin your day. We also made the library Python 2.7 and Python 3.5 compatible with a better test suite.
 
 ### Version 1.1.2
 

diff --git a/setup.py b/setup.py
@@ -45,16 +45,18 @@
 ## Define the classifiers
 ## See https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS  = (
-    'Development Status :: 4 - Beta',
+    'Development Status :: 5 - Production/Stable',
     'Environment :: Console',
-    'Intended Audience :: Developers',
+    'Intended Audience :: Science/Research',
     'License :: OSI Approved :: MIT License',
     'Natural Language :: English',
     'Operating System :: OS Independent',
     'Programming Language :: Python',
     'Programming Language :: Python :: 2.7',
-    'Topic :: Software Development',
-    'Topic :: Software Development :: Libraries :: Python Modules',
+    'Programming Language :: Python :: 3.5',
+    'Topic :: Communications :: Email',
+    'Topic :: Scientific/Engineering :: Information Analysis',
+    'Topic :: Scientific/Engineering :: Visualization',
     'Topic :: Utilities',
 )
 

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -24,7 +24,7 @@
 ## Module Constants
 ##########################################################################
 
-TEST_VERSION = "1.2" ## Also the expected version of the package
+TEST_VERSION = "1.3" ## Also the expected version of the package
 
 ##########################################################################
 ## Initialization Tests

diff --git a/tests/fixtures/headers.json b/tests/fixtures/headers.json
@@ -1 +1 @@
-{"Content-Type": 140, "X-Notifications": 2, "X-Account-Notification-Type": 2, "Received": 397, "X-Received": 173, "From": 140, "Feedback-ID": 2, "To": 140, "Subject": 140, "Date": 140, "Message-ID": 140, "X-Priority": 1, "Received-SPF": 87, "X-GM-THRID": 140, "X-Google-DKIM-Signature": 86, "X-Gmail-Labels": 140, "Authentication-Results": 87, "MIME-Version": 140, "DKIM-Signature": 87, "Delivered-To": 87, "Return-Path": 220, "X-Tribe-Message-Count": 140, "X-Automattic-Destination": 1, "x-no-auto-attachment": 3, "X-Gm-Message-State": 86}
+{"X-Gmail-Labels": 140, "Delivered-To": 87, "From": 140, "Return-Path": 220, "X-Tribe-Message-Count": 140, "X-Gm-Message-State": 86, "To": 140, "Message-ID": 140, "X-Automattic-Destination": 1, "X-Received": 173, "X-Google-DKIM-Signature": 86, "Date": 140, "X-Notifications": 2, "Received": 397, "Received-SPF": 87, "Authentication-Results": 87, "X-Account-Notification-Type": 2, "MIME-Version": 140, "X-Priority": 1, "X-GM-THRID": 140, "x-no-auto-attachment": 3, "DKIM-Signature": 87, "Content-Type": 140, "Feedback-ID": 2, "Subject": 140}
diff --git a/tests/fixtures/test.graphml b/tests/fixtures/test.graphml
@@ -1,37 +1,55 @@
 <?xml version='1.0' encoding='utf-8'?>
 <graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://graphml.graphdrawing.org/xmlns/1.0/graphml.xsd">
-  <key attr.name="weight" attr.type="double" for="edge" id="d3" />
-  <key attr.name="mbox" attr.type="string" for="graph" id="d2" />
-  <key attr.name="name" attr.type="string" for="graph" id="d1" />
+  <key attr.name="weight" attr.type="double" for="edge" id="d7" />
+  <key attr.name="norm" attr.type="double" for="edge" id="d6" />
+  <key attr.name="count" attr.type="int" for="edge" id="d5" />
+  <key attr.name="name" attr.type="string" for="graph" id="d4" />
+  <key attr.name="n_emails" attr.type="int" for="graph" id="d3" />
+  <key attr.name="mbox_size" attr.type="string" for="graph" id="d2" />
+  <key attr.name="mbox" attr.type="string" for="graph" id="d1" />
   <key attr.name="extracted" attr.type="string" for="graph" id="d0" />
   <graph edgedefault="undirected">
-    <data key="d0">Wed Jun 22 21:28:08 2016 -0400</data>
-    <data key="d1">Email Network</data>
-    <data key="d2">fixtures/test.mbox</data>
+    <data key="d0">Wed Jul 06 13:42:31 2016 -0400</data>
+    <data key="d1">fixtures/test.mbox</data>
+    <data key="d2">922.8KiB</data>
+    <data key="d3">140</data>
+    <data key="d4">Email Network</data>
     <node id="bertram.moody@gmail.com" />
+    <node id="noreply@google.com" />
     <node id="no-reply@accounts.google.com" />
     <node id="mildred.tilcott@gmail.com" />
-    <node id="leopold.wentzel@gmail.com" />
-    <node id="donotreply@wordpress.com" />
-    <node id="noreply@google.com" />
     <node id="mail-noreply@google.com" />
+    <node id="donotreply@wordpress.com" />
+    <node id="leopold.wentzel@gmail.com" />
     <edge source="bertram.moody@gmail.com" target="leopold.wentzel@gmail.com">
-      <data key="d3">0.5428571428571428</data>
+      <data key="d5">76</data>
+      <data key="d6">1.0</data>
+      <data key="d7">0.542857142857</data>
+    </edge>
+    <edge source="noreply@google.com" target="leopold.wentzel@gmail.com">
+      <data key="d5">1</data>
+      <data key="d6">0.0131578947368</data>
+      <data key="d7">0.00714285714286</data>
     </edge>
     <edge source="no-reply@accounts.google.com" target="leopold.wentzel@gmail.com">
-      <data key="d3">0.014285714285714285</data>
+      <data key="d5">2</data>
+      <data key="d6">0.0263157894737</data>
+      <data key="d7">0.0142857142857</data>
     </edge>
     <edge source="mildred.tilcott@gmail.com" target="leopold.wentzel@gmail.com">
-      <data key="d3">0.40714285714285714</data>
-    </edge>
-    <edge source="leopold.wentzel@gmail.com" target="donotreply@wordpress.com">
-      <data key="d3">0.007142857142857143</data>
+      <data key="d5">57</data>
+      <data key="d6">0.75</data>
+      <data key="d7">0.407142857143</data>
     </edge>
-    <edge source="leopold.wentzel@gmail.com" target="noreply@google.com">
-      <data key="d3">0.007142857142857143</data>
+    <edge source="mail-noreply@google.com" target="leopold.wentzel@gmail.com">
+      <data key="d5">3</data>
+      <data key="d6">0.0394736842105</data>
+      <data key="d7">0.0214285714286</data>
     </edge>
-    <edge source="leopold.wentzel@gmail.com" target="mail-noreply@google.com">
-      <data key="d3">0.02142857142857143</data>
+    <edge source="donotreply@wordpress.com" target="leopold.wentzel@gmail.com">
+      <data key="d5">1</data>
+      <data key="d6">0.0131578947368</data>
+      <data key="d7">0.00714285714286</data>
     </edge>
   </graph>
 </graphml>