Skip to content

Commit

Permalink
Merge pull request #320 from jdebacker/fix_testing_failures
Browse files Browse the repository at this point in the history 
Fix testing failures
  • Loading branch information
@jdebacker
jdebacker authored Mar 19, 2024
2 parents 0128695 + 5197895 commit f0b42df
Show file tree
Hide file tree
Showing 9 changed files with 8,052 additions and 6,145 deletions.
54 changes: 46 additions & 8 deletions Catalog/Tax-Brain.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@

<h1>Tax-Brain</h1>
<br />
<h5><p>Integrator package for multiple open source tax models</p></h5>
<h5>A Python package that wraps multiple economic models in one easy to use interface</h5>

</div>
<br />
<div class="banner-image">

<img alt="Tax-Brain" src="../imgs/PSL.svg" />
<img alt="Tax-Brain" src="https://github.com/PSLmodels/Tax-Brain/blob/master/docs/taxbrain.png?raw=true" />

</div>
</div>
Expand All @@ -71,31 +71,69 @@ <h5><p>Integrator package for multiple open source tax models</p></h5>
<div class="text-box">
<div class="box-header"></div>
<div class="box-content">
<p>Tax-Brain makes it easy for users to simulate the US tax system by providing a single interface for multiple tax models. Currently, Tax-Brain interfaces with <a href="https://github.com/PSLmodels/Tax-Calculator">Tax-Calculator</a> and <a href="https://github.com/PSLmodels/Behavioral-Responses">Behavioral-Responses</a>. Additional models will be added in the near future to expand Tax-Brain's capabilities to include modeling business taxation and running dynamic general equilibrium simulations.</p> <p>To learn more about how Tax-Brain works, see <a href="http://taxbrain.pslmodels.org">the Tax-Brain documentation</a>.</p>
Tax-Brain makes it easy for users to simulate the US tax system by providing a single interface for multiple tax models. Currently, Tax-Brain interfaces with Tax-Calculator and Behavioral-Responses. Additional models will be added in the near future to expand Tax-Brain's capabilities to include modeling business taxation and running dynamic general equilibrium simulations.
</div>
</div>



<div class="custom-section">

<div class="box">
<i class="fas fa-file-alt"> </i>
<h3>Policy Area</h3>
<p>Tax Microsimulation<br />Revenue Estimation<br />Distributional Analysis</p>
</div>

<div class="box">
<i class="fas fa-globe"> </i>
<h3>Geography</h3>
<p>United States</p>
</div>

<div class="box">
<i class="fas fa-code"> </i>
<h3>Language</h3>
<p>Python</p>
</div>

</div>


<div class="button-container">
<a class="button" href="http://taxbrain.pslmodels.org/content/intro.html">User documentation</a><a class="button" href="https://github.com/PSLmodels/Tax-Brain/blob/master/CONTRIBUTING.md">Contributor documentation</a><a class="button" href="https://github.com/PSLmodels/Tax-Brain/blob/master/RELEASES.md">Recent changes</a><a class="button" href="https://www.compmodels.org/PSLmodels/Tax-Brain/">Link to webapp</a>

<a class="button" href="https://github.com/PSLmodels/Tax-Brain"
>Code Repository</a
>

<a class="button" href="http://taxbrain.pslmodels.org/"
>User Documentation</a
>

<a class="button" href="http://taxbrain.pslmodels.org/content/contributing/contributor_guide.html"
>Contributor Documentation</a
>

<a class="button" href="https://github.com/PSLmodels/Tax-Brain/blob/master/RELEASES.md"
>Recent Changes</a
>

</div>

<section class="maintainers-section">
<h2>Maintainers:</h2>
<div class="maintainer-container">
<div class="maintainers-grid">
<div class="maintainer-card non-clickable">

<a class="maintainer-card" href="https://github.com/andersonfrailey">
<button class="maintainer-image-btn">
<img
alt="Anderson Frailey"
src="../imgs/default-maintainer.jpg"
src="https://avatars.githubusercontent.com/u/20684675?v=4"
/>
</button>
<p>Anderson Frailey</p>
</div>
</a>

</div>
</div>
Expand Down
86 changes: 52 additions & 34 deletions Catalog/Tax-Calculator.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@

<h1>Tax-Calculator</h1>
<br />
<h5><p>Tax-Calculator is an open-source microsimulation model for static analysis of USA federal income and payroll taxes.</p></h5>
<h5>USA Federal Individual Income and Payroll Tax Microsimulation Model</h5>

</div>
<br />
<div class="banner-image">

<img alt="Tax-Calculator" src="../imgs/PSL.svg" />
<img alt="" src="../imgs/PSL.svg" />

</div>
</div>
Expand All @@ -71,61 +71,79 @@ <h5><p>Tax-Calculator is an open-source microsimulation model for static analysi
<div class="text-box">
<div class="box-header"></div>
<div class="box-content">
<a href="https://PSLmodels.github.io/Tax-Calculator/">What is Tax-Calculator?</a>
Tax-Calculator is an open-source microsimulation model for static analysis of USA federal income and payroll taxes.
</div>
</div>



<div class="custom-section">

<div class="box">
<i class="fas fa-file-alt"> </i>
<h3>Policy Area</h3>
<p>Tax Microsimulation<br />Revenue Estimation<br />Distributional Analysis</p>
</div>

<div class="box">
<i class="fas fa-globe"> </i>
<h3>Geography</h3>
<p>United States</p>
</div>

<div class="box">
<i class="fas fa-code"> </i>
<h3>Language</h3>
<p>Python</p>
</div>

</div>


<div class="button-container">
<a class="button" href="http://PSLmodels.github.io/Tax-Calculator/">User documentation</a><a class="button" href="https://pslmodels.github.io/Tax-Calculator/contributing/contributor_guide.html">Contributor documentation</a><a class="button" href="https://pslmodels.github.io/Tax-Calculator/about/changes.html">Recent changes</a>

<a class="button" href="https://github.com/PSLmodels/Tax-Calculator"
>Code Repository</a
>

<a class="button" href="https://taxcalc.pslmodels.org/"
>User Documentation</a
>

<a class="button" href="https://taxcalc.pslmodels.org/contributing/contributor_guide.html"
>Contributor Documentation</a
>

<a class="button" href="https://taxcalc.pslmodels.org/about/releases.html"
>Recent Changes</a
>

</div>

<section class="maintainers-section">
<h2>Maintainers:</h2>
<div class="maintainer-container">
<div class="maintainers-grid">
<div class="maintainer-card non-clickable">

<a class="maintainer-card" href="https://github.com/jdebacker">
<button class="maintainer-image-btn">
<img
alt="Jason DeBacker"
src="../imgs/default-maintainer.jpg"
src="https://github.com/jdebacker.png"
/>
</button>
<p>Jason DeBacker</p>
</div>

<div class="maintainer-card non-clickable">
<button class="maintainer-image-btn">
<img
alt="Henry Doupe"
src="../imgs/default-maintainer.jpg"
/>
</button>
<p>Henry Doupe</p>
</div>

<div class="maintainer-card non-clickable">
<button class="maintainer-image-btn">
<img
alt="Anderson Frailey"
src="../imgs/default-maintainer.jpg"
/>
</button>
<p>Anderson Frailey</p>
</div>

<div class="maintainer-card non-clickable">
</a>

<a class="maintainer-card" href="https://github.com/MattHJensen/">
<button class="maintainer-image-btn">
<img
alt="Matt Jensen"
src="../imgs/default-maintainer.jpg"
alt="Matthew Jensen"
src="https://avatars.githubusercontent.com/u/8301092?v=4"
/>
</button>
<p>Matt Jensen</p>
</div>
<p>Matthew Jensen</p>
</a>

</div>
</div>
Expand Down
50 changes: 42 additions & 8 deletions Catalog/Tax-Cruncher.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@

<h1>Tax-Cruncher</h1>
<br />
<h5><p>Calculates federal tax liabilities from individual data under different policy proposals</p></h5>
<h5></h5>

</div>
<br />
<div class="banner-image">

<img alt="Tax-Cruncher" src="../imgs/PSL.svg" />
<img alt="" src="../imgs/PSL.svg" />

</div>
</div>
Expand All @@ -71,31 +71,65 @@ <h5><p>Calculates federal tax liabilities from individual data under different p
<div class="text-box">
<div class="box-header"></div>
<div class="box-content">
<p>Tax-Cruncher calculates federal tax liabilities from individual data under different policy scenarios. </p> <p>Tax-Cruncher accepts inputs similar to NBER's <a href="https://users.nber.org/~taxsim/taxsim27/">TAXSIM Version 27</a>, converts those inputs to a format usable by <a href="https://github.com/PSLmodels/Tax-Calculator">Tax-Calculator</a>, and uses Tax-Calculator capabilities to analyze the user-provided data under various tax policy proposals.</p> <p>Tax-Cruncher's web application is hosted on <a href="https://compute.studio/PSLmodels/Tax-Cruncher/">Compute Studio</a>. The code that powers the web application can be found in this repository in the <a href="https://github.com/PSLmodels/Tax-Cruncher/tree/master/cs-config">cs-config</a> directory.</p>
Calculates federal tax liabilities from individual data under a range of policy scenarios.
</div>
</div>



<div class="custom-section">

<div class="box">
<i class="fas fa-file-alt"> </i>
<h3>Policy Area</h3>
<p>Tax Microsimulation<br />Revenue Estimation<br />Distributional Analysis</p>
</div>

<div class="box">
<i class="fas fa-globe"> </i>
<h3>Geography</h3>
<p>United States</p>
</div>

<div class="box">
<i class="fas fa-code"> </i>
<h3>Language</h3>
<p>Python</p>
</div>

</div>


<div class="button-container">
<a class="button" href="https://github.com/PSLmodels/Tax-Cruncher#how-to-use-tax-cruncher">User documentation</a><a class="button" href="https://github.com/PSLmodels/Tax-Cruncher/releases">Recent changes</a><a class="button" href="https://www.compmodels.org/PSLmodels/Tax-Cruncher/">Link to webapp</a>

<a class="button" href="https://github.com/PSLmodels/tax-cruncher"
>Code Repository</a
>

<a class="button" href="https://github.com/PSLmodels/Tax-Cruncher/blob/master/docs/Introduction-to-Tax-Cruncher.pdf"
>User Documentation</a
>

<a class="button" href="https://github.com/PSLmodels/Tax-Cruncher/releases"
>Recent Changes</a
>

</div>

<section class="maintainers-section">
<h2>Maintainers:</h2>
<div class="maintainer-container">
<div class="maintainers-grid">
<div class="maintainer-card non-clickable">

<a class="maintainer-card" href="https://github.com/Peter-Metz">
<button class="maintainer-image-btn">
<img
alt="Peter Metz"
src="../imgs/default-maintainer.jpg"
src="https://avatars.githubusercontent.com/u/43755005?v=4"
/>
</button>
<p>Peter Metz</p>
</div>
</a>

</div>
</div>
Expand Down
Loading

0 comments on commit f0b42df

Please sign in to comment.