Merge pull request #386 from hdoupe/update-build

Update for version 0.5.+ conda builds

conda.recipe/build.sh

@@ -3,7 +3,7 @@
 BLD_DIR=`pwd`
 
 # Recipe and source are stored together
-SRC_DIR=$RECIPE_DIR/../../
+SRC_DIR=$RECIPE_DIR/../
 pushd $SRC_DIR
 
 $PYTHON setup.py install

conda.recipe/meta.yaml

@@ -1,14 +1,14 @@
 package:
   name: ogusa
-  version: 0.4
+  version: 0.5.10
 
 requirements:
   build:
+    - python
+    - pip
     - matplotlib
     - numpy >=1.12.1
     - pandas >=0.20.1
-    - pytest
-    - python
     - scipy
     - setuptools
     - taxcalc
@@ -22,6 +22,7 @@ requirements:
     - scipy
     - setuptools
     - taxcalc
+    - dask
 
 about:
   home: https://github.com/open-source-economics/OG-USA/
@@ -33,7 +34,6 @@ test:
     - ogusa.TPI
     - ogusa.calibrate
     - ogusa.demographics
-    - ogusa.demographics_old
     - ogusa.elliptical_u_est
     - ogusa.firm
     - ogusa.fiscal
@@ -48,4 +48,3 @@ test:
     - ogusa.utils
     - ogusa.wealth
     - ogusa.wealthinit
-

ogusa/TPI_graphs.py

@@ -19,12 +19,14 @@
     Packages
 ------------------------------------------------------------------------
 '''
+import os
+import pickle
 
 import numpy as np
 import matplotlib
 import matplotlib.pyplot as plt
 from mpl_toolkits.mplot3d import Axes3D
-import cPickle as pickle
+# import cPickle as pickle
 
 import firm
 
@@ -450,7 +452,7 @@ def gini_nocol(path, omega):
     cum_levels[:, 1:] = cum_levels[:, :-1]
     cum_levels[:, 0] = 0
     G = 2 * (.5 - (cum_levels * omega_sorted).sum(1))
-    print G[-1]
+    print(G[-1])
     return G
 
 '''
@@ -728,7 +730,7 @@ def gini_nocol(path, omega):
 X, Y = np.meshgrid(domain, Jgrid)
 
 
-print 'Starting movies'
+print('Starting movies')
 # top zlim is for the income tax, bottom zlim is for the wealth tax
 
 

ogusa/get_micro_data.py

@@ -23,13 +23,12 @@
 import dask.multiprocessing
 import numpy as np
 import pickle
-from ogusa.utils import DEFAULT_START_YEAR, TC_LAST_YEAR
-from ogusa.utils import RECORDS_START_YEAR
+from ogusa.utils import DEFAULT_START_YEAR, TC_LAST_YEAR, PUF_START_YEAR
 
 
 def get_calculator(baseline, calculator_start_year, reform=None,
                    data=None, weights=None,
-                   records_start_year=RECORDS_START_YEAR):
+                   records_start_year=PUF_START_YEAR):
     '''
     --------------------------------------------------------------------
     This function creates the tax calculator object for the microsim
@@ -41,7 +40,8 @@ def get_calculator(baseline, calculator_start_year, reform=None,
     data                     = DataFrame for Records object
     weights                  = weights DataFrame for Records object
     records_start_year       = the start year for the data and weights
-                               dfs
+                               dfs (default is set to the PUF start year
+                               as defined in the Tax-Calculator project)
 
     RETURNS: Calculator object with a current_year equal to
              calculator_start_year

ogusa/tests/test_basic.py

@@ -4,7 +4,7 @@
 import pickle
 import numpy as np
 import pandas as pd
-from ogusa.utils import RECORDS_START_YEAR
+from ogusa.utils import CPS_START_YEAR
 from ogusa.utils import comp_array, comp_scalar, dict_compare
 from ogusa.get_micro_data import get_calculator
 from ogusa import SS
@@ -190,7 +190,7 @@ def test_get_micro_data_get_calculator():
     calc = get_calculator(baseline=False, calculator_start_year=2017,
                           reform=reform, data=TAXDATA,
                           weights=WEIGHTS,
-                          records_start_year=RECORDS_START_YEAR)
+                          records_start_year=CPS_START_YEAR)
     assert calc.current_year == 2017
 
     reform = {
@@ -207,5 +207,5 @@ def test_get_micro_data_get_calculator():
     calc2 = get_calculator(baseline=False, calculator_start_year=2017,
                            reform=reform, data=TAXDATA,
                            weights=WEIGHTS,
-                           records_start_year=RECORDS_START_YEAR)
+                           records_start_year=CPS_START_YEAR)
     assert calc2.current_year == 2017

ogusa/tests/test_data.py

@@ -1,6 +1,6 @@
 import pytest
 import os
-from ogusa.utils import RECORDS_START_YEAR
+from ogusa.utils import CPS_START_YEAR
 
 
 def test_cps():
@@ -14,7 +14,7 @@ def test_cps():
 
     calc = get_micro_data.get_calculator(
         baseline, start_year, reform=reform,
-        records_start_year=RECORDS_START_YEAR, data="cps")
+        records_start_year=CPS_START_YEAR, data="cps")
     # blind_head is only in the CPS file and e00700 is only in the PUF.
     # See taxcalc/records_variables.json
     assert (calc.array("blind_head").sum() > 0 and
@@ -38,7 +38,7 @@ def test_set_path():
     with pytest.raises((IOError, ValueError), match="notapath.csv"):
         get_micro_data.get_calculator(
             baseline, start_year, reform=reform,
-            records_start_year=RECORDS_START_YEAR, data="notapath.csv")
+            records_start_year=CPS_START_YEAR, data="notapath.csv")
 
 
 def test_puf_path():
@@ -68,4 +68,4 @@ def test_puf_path():
         with pytest.raises((IOError, ValueError), match="puf.csv"):
             get_micro_data.get_calculator(
                 baseline, start_year, reform=reform,
-                records_start_year=RECORDS_START_YEAR, data=None)
+                records_start_year=CPS_START_YEAR, data=None)

ogusa/utils.py

@@ -12,6 +12,7 @@
 import os
 from io import StringIO
 import numpy as np
+import taxcalc
 try:
     import cPickle as pickle
 except ImportError:
@@ -31,7 +32,8 @@
 TC_LAST_YEAR = 2027
 
 # Year of data used (e.g. PUF or CPS year)
-RECORDS_START_YEAR = 2011
+CPS_START_YEAR = taxcalc.Records.CPSCSV_YEAR
+PUF_START_YEAR = taxcalc.Records.PUFCSV_YEAR
 
 # for f in (REFORM_DIR, BASELINE_DIR):
 #     if not os.path.exists(f):