Skip to content

Commit

Permalink
Merge in recent changes on master branch
Browse files Browse the repository at this point in the history
  • Loading branch information
martinholmer committed Nov 24, 2024
2 parents 00aa256 + 404ac22 commit 673ef6f
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Build
shell: bash -l {0}
run: |
pip install -e . --user --config-settings editable_mode=compat
pip install -e .
pip install pytest-cov --user
pip install pytest-pycodestyle --user
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_jupyterbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
run: |
pip install jupyter-book
conda install -c pslmodels behresp
pip install -e . --config-settings editable_mode=compat
pip install -e .
python docs/guide/make/make_uguide.py
cd docs
jb build .
2 changes: 1 addition & 1 deletion .github/workflows/deploy_jupyterbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: |
pip install jupyter-book
conda install -c pslmodels behresp
pip install -e . --config-settings editable_mode=compat
pip install -e .
cd docs
jb build .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_parameters_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: |
pip install jupyter-book
conda install -c pslmodels behresp
pip install -e . --config-settings editable_mode=compat
pip install -e .
python docs/guide/make/make_uguide.py
cd docs
jb build .
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ clean:

.PHONY=package
package:
@pip install -e . --config-settings editable_mode=compat
@pip install -e .

define pytest-setup
rm -f taxcalc/tests/reforms_actual_init
Expand Down
1 change: 1 addition & 0 deletions taxcalc.egg-info/SOURCES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ gitpr.bat
gitsync
gitsync.bat
ppp.py
pyproject.toml
pytest.ini
setup.py
tctest-nojit.sh
Expand Down

0 comments on commit 673ef6f

Please sign in to comment.