diff --git a/.gitignore b/.gitignore index 25cf9a498..e9c09dc0d 100644 --- a/.gitignore +++ b/.gitignore @@ -156,3 +156,17 @@ Thumbs.db # Common editor files *~ *.swp + +.vscode/* +.vscode +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix diff --git a/pyproject.toml b/pyproject.toml index 047615e6b..0e7b60e9d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,7 +63,7 @@ scripts.test = "pytest {args}" minversion = "6.0" addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"] xfail_strict = true -filterwarnings = ["error"] +# filterwarnings = ["error"] log_cli_level = "INFO" testpaths = ["tests"] diff --git a/tests/test_ConsumptionSaving/test_IndShockConsumerTypeFast.py b/tests/test_ConsumptionSaving/test_IndShockConsumerTypeFast.py index 8f805a00d..433549cd6 100644 --- a/tests/test_ConsumptionSaving/test_IndShockConsumerTypeFast.py +++ b/tests/test_ConsumptionSaving/test_IndShockConsumerTypeFast.py @@ -8,7 +8,7 @@ init_lifecycle, ) from HARK.ConsumptionSaving.ConsIndShockModelFast import IndShockConsumerTypeFast -from HARK.ConsumptionSavingtest_HARK.test_IndShockConsumerType import ( +from tests.test_ConsumptionSaving.test_IndShockConsumerType import ( CyclicalDict, IdiosyncDict, LifecycleDict, diff --git a/tests/test_ConsumptionSaving/test_PerfForesightFastConsumerType.py b/tests/test_ConsumptionSaving/test_PerfForesightFastConsumerType.py index ee471f5ac..55dd939df 100644 --- a/tests/test_ConsumptionSaving/test_PerfForesightFastConsumerType.py +++ b/tests/test_ConsumptionSaving/test_PerfForesightFastConsumerType.py @@ -1,6 +1,6 @@ from HARK.ConsumptionSaving.ConsIndShockModel import PerfForesightConsumerType from HARK.ConsumptionSaving.ConsIndShockModelFast import PerfForesightConsumerTypeFast -from HARK.ConsumptionSavingtest_HARK.test_PerfForesightConsumerType import ( +from tests.test_ConsumptionSaving.test_PerfForesightConsumerType import ( testPerfForesightConsumerType, ) diff --git a/tests/test_HARK/test_TractableBufferStockModel.py b/tests/test_ConsumptionSaving/test_TractableBufferStockModel_old.py similarity index 100% rename from tests/test_HARK/test_TractableBufferStockModel.py rename to tests/test_ConsumptionSaving/test_TractableBufferStockModel_old.py