Fix pylint E1111 and E1120 warnings; update bokeh required version

conda.recipe/meta.yaml

@@ -11,7 +11,7 @@ requirements:
     - "python>=3.10, <3.13"
     - "numpy>=1.26"
     - "pandas>=2.2"
-    - "bokeh>=2.4"
+    - "bokeh>=3.6"
     - "paramtools>=0.19.0"
     - numba
     - curl

environment.yml

@@ -5,7 +5,7 @@ dependencies:
 - "python>=3.10, <3.13"
 - "numpy>=1.26"
 - "pandas>=2.2"
-- "bokeh>=2.4"
+- "bokeh>=3.6"
 - numba
 - curl
 - setuptools

setup.py

@@ -4,16 +4,15 @@
 
 from setuptools import setup
 
-with open("README.md") as f:
+with open("README.md", "r", encoding="utf-8") as f:
     longdesc = f.read()
 
 VERSION = "4.4.0"
 
 config = {
-    "description": "Tax Calculator",
+    "description": "Tax-Calculator",
     "url": "https://github.com/PSLmodels/Tax-Calculator",
     "download_url": "https://github.com/PSLmodels/Tax-Calculator",
-    "description": "taxcalc",
     "long_description_content_type": "text/markdown",
     "long_description": longdesc,
     "version": VERSION,
@@ -24,7 +23,7 @@
     "install_requires": [
         "numpy>=1.26",
         "pandas>=2.2",
-        "bokeh>=2.4",
+        "bokeh>=3.6",
         "numba",
         "paramtools>=0.19.0",
     ],

taxcalc.egg-info/PKG-INFO

@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.26
 Requires-Dist: pandas>=2.2
-Requires-Dist: bokeh>=2.4
+Requires-Dist: bokeh>=3.6
 Requires-Dist: numba
 Requires-Dist: paramtools>=0.19.0
 

taxcalc.egg-info/requires.txt

@@ -1,5 +1,5 @@
 numpy>=1.26
 pandas>=2.2
-bokeh>=2.4
+bokeh>=3.6
 numba
 paramtools>=0.19.0

taxcalc/calculator.py

@@ -1043,17 +1043,13 @@ def pch_graph(self, calc, pop_quantiles=False):
         # construct data for graph
         data = pch_graph_data(vdf, year=self.current_year,
                               pop_quantiles=pop_quantiles)
-        del vdf
-        del vdf1
-        del vdf2
         # construct figure from data
         fig = pch_graph_plot(data,
                              width=850,
                              height=500,
                              xlabel='',
                              ylabel='',
                              title='')
-        del data
         return fig
 
     REQUIRED_REFORM_KEYS = set(['policy'])

taxcalc/tests/test_data.py

@@ -81,7 +81,7 @@ def __init__(self, data, start_year, gfactors, weights):
         def _extrapolate(self, year):
             val = getattr(self, 'e00300')
             setattr(
-                self, 'e00300', val* self.gfactors.factor_value('AINTS', year)
+                self, 'e00300', val * self.gfactors.factor_value('AINTS', year)
             )
 
     # test Recs class for incorrect instantiation

taxcalc/tests/test_decorators.py

@@ -113,7 +113,9 @@ def magic_calc(x, y, z):
 def magic(pm, pf):
     """Function docstring"""
     # Adjustments
+    # pylint: disable=no-value-for-parameter
     outputs = pf.a, pf.b = magic_calc(pm, pf)
+    # pylint: enable=no-value-for-parameter
     header = ['a', 'b']
     return DataFrame(data=np.column_stack(outputs), columns=header)
 
@@ -182,6 +184,9 @@ def test_magic_apply_jit_swap():
     assert_frame_equal(xx, exp)
 
 
+# pylint: disable=no-value-for-parameter
+
+
 def test_magic_iterate_jit():
     """Test docstring"""
     pm = Foo()
@@ -293,6 +298,9 @@ def test_function_parameters_optional():
     assert_frame_equal(ans, exp)
 
 
+# pylint: enable=no-value-for-parameter
+
+
 def unjittable_function1(w, x, y, z):
     """Function docstring"""
     a = x + y

taxcalc/utils.py

@@ -1311,7 +1311,7 @@ def pch_graph_plot(data,
     fig.yaxis.axis_label_text_font_size = '12pt'
     fig.yaxis.axis_label_text_font_style = 'normal'
     fig.yaxis[0].formatter = PrintfTickFormatter(format='%.1f')
-    # return fig  # bokeh 3.4.1 cannot save this figure for some unknown reason
+    return fig
 
 
 def write_graph_file(figure, filename, title):