diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml deleted file mode 100644 index a6bc89ee..00000000 --- a/.github/workflows/python-app.yml +++ /dev/null @@ -1,35 +0,0 @@ -# This workflow will install Python dependencies, run tests and lint with a single version of Python -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python - -name: Python application - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -permissions: - contents: read - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up Python 3.10 - uses: actions/setup-python@v3 - with: - python-version: "3.10" - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -e .[dev] - - name: Lint - run: | - ./scripts/lint.sh - - name: Test with pytest - run: | - cd tests && python -m pytest && cd .. diff --git a/cities/__init__.py b/cities/__init__.py index 9db96c01..f993e182 100644 --- a/cities/__init__.py +++ b/cities/__init__.py @@ -2,4 +2,5 @@ Project short description. """ + __version__ = "0.0.1" diff --git a/cities/queries/causal_insight_slim.py b/cities/queries/causal_insight_slim.py index 65b17f3f..3efc6d09 100644 --- a/cities/queries/causal_insight_slim.py +++ b/cities/queries/causal_insight_slim.py @@ -500,10 +500,10 @@ def get_fips_predictions( difference = ( self.predictions_original["observed"] - self.observed_outcomes_original ) - self.predictions_original[ - ["observed", "mean", "low", "high"] - ] = self.predictions_original[["observed", "mean", "low", "high"]].sub( - difference, axis=0 + self.predictions_original[["observed", "mean", "low", "high"]] = ( + self.predictions_original[["observed", "mean", "low", "high"]].sub( + difference, axis=0 + ) ) def plot_predictions( diff --git a/cities/queries/fips_query.py b/cities/queries/fips_query.py index 2878f31d..5d6a14f3 100644 --- a/cities/queries/fips_query.py +++ b/cities/queries/fips_query.py @@ -467,9 +467,9 @@ def find_euclidean_kins(self): if col.endswith(feature) ] if _selected: - atemporal_aggregated_dict[ - feature - ] = atemporal_featurewise_contributions_df[_selected].sum(axis=1) + atemporal_aggregated_dict[feature] = ( + atemporal_featurewise_contributions_df[_selected].sum(axis=1) + ) aggregated_atemporal_featurewise_contributions_df = pd.DataFrame( atemporal_aggregated_dict @@ -489,9 +489,9 @@ def find_euclidean_kins(self): axis=1, ) columns_to_normalize = self.aggregated_featurewise_contributions.iloc[:, 3:] - self.aggregated_featurewise_contributions.iloc[ - :, 3: - ] = columns_to_normalize.div(columns_to_normalize.sum(axis=1), axis=0) + self.aggregated_featurewise_contributions.iloc[:, 3:] = ( + columns_to_normalize.div(columns_to_normalize.sum(axis=1), axis=0) + ) # some sanity checks count = sum([1 for distance in distances if distance == 0]) diff --git a/docs/guides/counterfactual-explained.ipynb b/docs/guides/counterfactual-explained.ipynb index f60fb50b..1f2bcd99 100644 --- a/docs/guides/counterfactual-explained.ipynb +++ b/docs/guides/counterfactual-explained.ipynb @@ -21,10 +21,14 @@ "import seaborn as sns\n", "\n", "from cities.queries.causal_insight_slim import CausalInsightSlim\n", - "from cities.utils.data_grabber import (DataGrabber, find_repo_root,\n", - " list_available_features,\n", - " list_interventions, list_outcomes,\n", - " list_tensed_features)\n", + "from cities.utils.data_grabber import (\n", + " DataGrabber,\n", + " find_repo_root,\n", + " list_available_features,\n", + " list_interventions,\n", + " list_outcomes,\n", + " list_tensed_features,\n", + ")\n", "\n", "root = find_repo_root()" ] diff --git a/docs/guides/similarity_demo.ipynb b/docs/guides/similarity_demo.ipynb index d52c72c8..2fe4ae81 100644 --- a/docs/guides/similarity_demo.ipynb +++ b/docs/guides/similarity_demo.ipynb @@ -11,10 +11,15 @@ "import os\n", "\n", "from cities.queries.fips_query import FipsQuery\n", + "\n", "# proper imports\n", - "from cities.utils.data_grabber import (DataGrabber, list_available_features,\n", - " list_interventions, list_outcomes,\n", - " list_tensed_features)\n", + "from cities.utils.data_grabber import (\n", + " DataGrabber,\n", + " list_available_features,\n", + " list_interventions,\n", + " list_outcomes,\n", + " list_tensed_features,\n", + ")\n", "\n", "smoke_test = \"CI\" in os.environ\n", "smoke_test = True\n", diff --git a/tests/test_inference.py b/tests/test_inference.py index 07a22bbc..6de75a1d 100644 --- a/tests/test_inference.py +++ b/tests/test_inference.py @@ -34,7 +34,7 @@ # @pytest.mark.parametrize("intervention", interventions) # @pytest.mark.parametrize("outcome", outcomes) @pytest.mark.parametrize("shift", shifts) -def test_smoke_InteractionsModel(shift): #(intervention, outcome, shift): +def test_smoke_InteractionsModel(shift): # (intervention, outcome, shift): model = InteractionsModel( outcome_dataset="unemployment_rate", intervention_dataset="spending_commerce",