Merge pull request #424 from jdebacker/black

Move to black code formatting
PSLmodels · Mar 9, 2023 · db4056d · db4056d
2 parents d29d94a + 619b008
commit db4056d
Show file tree

Hide file tree

Showing 9 changed files with 468 additions and 164 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,3 @@
+# .git-blame-ignore-revs
+# ignore initial move to black formatting
+04ea4a46a67aa6a064e4e1ede5cb8e6fe824e4b2
diff --git a/.github/workflows/check_black.yml b/.github/workflows/check_black.yml
@@ -0,0 +1,15 @@
+
+name: Check Black formatting
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - uses: psf/black@stable
+        with:
+          options: " --check"
+          src: "."
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
diff --git a/cps_stage2/stage2.py b/cps_stage2/stage2.py
@@ -46,8 +46,7 @@
 
 
 def main():
-    """
-    """
+    """ """
     print("Reading Data")
     cps = pd.read_csv(
         Path(CUR_PATH, "..", "data", "cps_raw.csv.gz"), compression="gzip"

diff --git a/environment.yml b/environment.yml
@@ -25,4 +25,5 @@ dependencies:
 - pip
 - pip:
   - requests-html
+  - black
   - jupyter-book>=0.9.1
diff --git a/history/report_utils.py b/history/report_utils.py
diff --git a/puf_stage2/dataprep.py b/puf_stage2/dataprep.py
@@ -2,7 +2,6 @@
 
 
 def dataprep(puf, Stage_I_factors, Stage_II_targets, year):
-
     print("Preparing coefficient matrix for year {} .....".format(year))
 
     s006 = np.where(

diff --git a/puf_stage3/stage3.py b/puf_stage3/stage3.py
@@ -49,7 +49,6 @@ def adjustment(agi, var, var_name, target, weights, blowup):
     # In each year find the ratios to get the correct distribution
     ratios_df = pd.DataFrame()
     for year in range(start_year, end_year + 1):
-
         goal_amts = goal_total[year][0] * distribution[year]
 
         wt_year = "WT{}".format(year)

diff --git a/taxdata/cps/transform_sas.py b/taxdata/cps/transform_sas.py
@@ -61,7 +61,6 @@ def parse_sas(sas):
 
 
 def main():
-
     master_dict = {}
     for year in CPS_META_DATA.keys():
         # read in file text