update make test, update pytest workflow

crytic · Mar 26, 2024 · 3f65f70 · 3f65f70
1 parent c832780
commit 3f65f70
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -41,12 +41,6 @@ jobs:
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
-
-      - name: Install Foundry dependencies
-        run: forge install crytic/properties --no-commit
-
-      - name: Set remappings
-        run: forge remappings > remappings.txt
 
       - name: Run tests
         run: |

diff --git a/Makefile b/Makefile
@@ -68,7 +68,10 @@ reformat:
 test tests: $(VENV)/pyvenv.cfg
 	. $(VENV_BIN)/activate && \
 		solc-select use 0.8.19 --always-install && \
-		pytest $(T) $(TEST_ARGS)
+		cd tests/test_data && \
+		forge install && \
+		cd ../.. && \
+		pytest --ignore tests/test_data/lib $(T) $(TEST_ARGS)
 
 .PHONY: package
 package: $(VENV)/pyvenv.cfg