Update requirements, drop __VERSION__, bump to 0.2.0-dev

SamStudio8 · Sep 6, 2014 · c91c4a3 · c91c4a3
1 parent 39bbdbf
commit c91c4a3
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 15 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 History
 =======
 
+0.2.0-dev
+---------
+* Dropped support for :class:`frontier.frame.DataFrame`, electing to return a
+  `pandas` DataFrame instead.
+
 0.1.3-dev
 ---------
 

diff --git a/frontier/IO/AQCReader.py b/frontier/IO/AQCReader.py
@@ -1,6 +1,5 @@
 __author__ = "Sam Nicholls <sn8@sanger.ac.uk>"
 __copyright__ = "Copyright (c) Sam Nicholls"
-__version__ = "0.1.2"
 __maintainer__ = "Sam Nicholls <sam@samnicholls.net>"
 
 from frontier.frontier import classify_label, encode_class

diff --git a/frontier/IO/AbstractReader.py b/frontier/IO/AbstractReader.py
@@ -1,6 +1,5 @@
 __author__ = "Sam Nicholls <sn8@sanger.ac.uk>"
 __copyright__ = "Copyright (c) Sam Nicholls"
-__version__ = "0.1.2"
 __maintainer__ = "Sam Nicholls <sam@samnicholls.net>"
 
 class AbstractReader(object):

diff --git a/frontier/IO/BamcheckReader.py b/frontier/IO/BamcheckReader.py
@@ -1,6 +1,5 @@
 __author__ = "Sam Nicholls <sn8@sanger.ac.uk>"
 __copyright__ = "Copyright (c) Sam Nicholls"
-__version__ = "0.1.2"
 __maintainer__ = "Sam Nicholls <sam@samnicholls.net>"
 
 import os

diff --git a/frontier/__init__.py b/frontier/__init__.py
@@ -2,4 +2,4 @@
 
 __author__ = "Sam Nicholls"
 __email__ = "sam@samnicholls.net"
-__version__ = "0.1.3-dev"
+__version__ = "0.2.0-dev"
diff --git a/frontier/frontier.py b/frontier/frontier.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 __author__ = "Sam Nicholls <sn8@sanger.ac.uk>"
 __copyright__ = "Copyright (c) Sam Nicholls"
-__version__ = "0.1.2"
 __maintainer__ = "Sam Nicholls <sam@samnicholls.net>"
 
 import math

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
 numpy
+pandas
 tox
 pytest
 nose

diff --git a/setup.py b/setup.py
@@ -7,7 +7,8 @@
 CHANGELOG = open('CHANGELOG.rst').read()
 
 requirements = [
-    "numpy"
+    "numpy",
+    "pandas"
 ]
 
 test_requirements = [
@@ -19,7 +20,7 @@
 
 setuptools.setup(
     name="frontier",
-    version="0.1.3-dev",
+    version="0.2.0-dev",
     url="https://github.com/samstudio8/frontier",
 
     description="Provides interfaces for the reading, storage and retrieval of large machine learning data sets for use with scikit-learn",

diff --git a/tests/data/example.aqc.txt b/tests/data/example.aqc.txt
@@ -1,10 +1,10 @@
 lanelet	sample	study	npg	aqc	...
-9999_9#9	AQCTest000008	AQCTest	warn	warning	...
-9999_9#8	AQCTest000007	AQCTest	pass	passed	...
+9999_9#1	AQCTest000000	AQCTest	pass	passed	...
+9999_9#3	AQCTest000002	AQCTest	fail	failed	...
+9999_9#2	AQCTest000001	AQCTest	pass	pass	...
 9999_9#5	AQCTest000004	AQCTest	warn	warn	...
 9999_9#4	AQCTest000003	AQCTest	warn	warning	...
 9999_9#7	AQCTest000006	AQCTest	fail	fail	...
 9999_9#6	AQCTest000005	AQCTest	pass	passed	...
-9999_9#1	AQCTest000000	AQCTest	pass	passed	...
-9999_9#3	AQCTest000002	AQCTest	fail	failed	...
-9999_9#2	AQCTest000001	AQCTest	pass	pass	...
+9999_9#9	AQCTest000008	AQCTest	warn	warning	...
+9999_9#8	AQCTest000007	AQCTest	pass	passed	...
diff --git a/tests/data/example.aqc.uniq.txt b/tests/data/example.aqc.uniq.txt
@@ -1,9 +1,9 @@
 lanelet	sample	study	npg	aqc	...
+9998_9#1	AQCTest100000	AQCTest	npg	pass	...
+9998_9#2	AQCTest100001	AQCTest	npg	pass	...
+9998_9#3	AQCTest100002	AQCTest	npg	pass	...
 9998_9#4	AQCTest100003	AQCTest	npg	warn	...
 9998_9#5	AQCTest100004	AQCTest	npg	pass	...
 9998_9#6	AQCTest100005	AQCTest	npg	fail	...
 9998_9#7	AQCTest100006	AQCTest	npg	pass	...
-9998_9#1	AQCTest100000	AQCTest	npg	pass	...
-9998_9#2	AQCTest100001	AQCTest	npg	pass	...
-9998_9#3	AQCTest100002	AQCTest	npg	pass	...
 9998_9#8	AQCTest100007	AQCTest	npg	pass	...