Bumped to version 0.6.1

Valuehorizon · Jun 8, 2015 · 13024dd · 13024dd
1 parent d1c5a00
commit 13024dd
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -8,8 +8,9 @@ Valuehorizon Forex 0.3.1 documentation!
 
 The foreign exchange market (forex, FX, or currency market) is a global decentralized market for the trading of currencies. In terms of volume of trading, it is by far the largest market in the world. This reusable Django app provides you with the tools to keep track of a set of currencies and their price data.
 
-Valuehorizon Forex includes two models - ``Currency`` and ``CurrencyPrice``. All ``Currency`` data are provided and maintained. Some sample ``CurrencyPrice``
-data are provided, but for a full production dataset, you will have to source this data yourself. 
+Valuehorizon Forex includes two models - ``Currency`` and ``CurrencyPrice``. 
+All ``Currency`` data are provided and maintained. Some sample ``CurrencyPrice`` data are provided, 
+but for a full production dataset, you will have to source the ``CurrencyPrice`` data yourself. 
 
 Contents:
 
@@ -20,6 +21,8 @@ Contents:
    data
    usage
    examples
+   documentation
+   faq
    api
 
 Indices and tables

diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -29,8 +29,9 @@ First, install the ``python-dev`` library through the package manager::
 
    $ sudo apt-get install python-dev
 
-Next, install ``numpy`` and ``pandas``::
+Next, install ``lxml``, ``numpy`` and ``pandas``::
    
+   $ pip install lxml
    $ pip install numpy
    $ pip install pandas
 

diff --git a/forex/__init__.py b/forex/__init__.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.4.1'  # pragma: no cover
+__version__ = '0.6.1'  # pragma: no cover
diff --git a/forex/models.py b/forex/models.py
@@ -62,7 +62,7 @@ def generate_dataframe(self, start_date=None, end_date=None):
 class CurrencyPriceManager(Manager):
     """ Adds some added functionality """
 
-    def generate_dataframe(self, symbols=None, date_index = None):
+    def generate_dataframe(self, symbols=None, date_index=None, price_type="mid"):
         """
         Generate a dataframe consisting of the currency prices (specified by symbols)
         from the start to end date
@@ -89,8 +89,17 @@ def generate_dataframe(self, symbols=None, date_index = None):
         df = DataFrame.from_records(forex_data_array, index='date')
 
         df['date'] = df.index
-        df['mid_price'] = (df['ask_price'] + df['bid_price']) / 2
-        df = df.pivot(index='date', columns='symbol', values='mid_price')
+
+        if price_type == "mid":
+            df['price'] = (df['ask_price'] + df['bid_price']) / 2
+        elif price_type == "ask_price":
+            df['price'] = df['ask_price']
+        elif price_type == "bid_price":
+            df['price'] = df['bid_price']
+        else:
+            raise ValueError("price_type must be on of 'ask', 'bid' or 'mid'")
+
+        df = df.pivot(index='date', columns='symbol', values='price')
         df = df.reindex(date_index)
         df = df.fillna(method="ffill")
         unlisted_symbols = list(set(symbols) - set(df.columns))

diff --git a/manage.py b/manage.py
@@ -4,7 +4,7 @@
 
 if __name__ == "__main__":
     os.environ.setdefault('DJANGO_SETTINGS_MODULE',
-                          'forex.tests.south_settings')
+                          'forex.settings.test_settings')
 
     from django.core.management import execute_from_command_line
 

diff --git a/test_requirements.txt b/test_requirements.txt
@@ -11,3 +11,4 @@ tox
 Django==1.8.1
 numpy==1.9.2
 pandas==0.13.0
+lxml==3.4.4