Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor the main Makefile #3988

Merged
merged 29 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
da33c9f
Refactor the main Makefile
jtraglia Oct 18, 2024
5d9181a
Update docs & CI files
jtraglia Oct 18, 2024
d7a81f5
Add preset & bls options for make test
jtraglia Oct 18, 2024
d431420
Remove old reference to codespell rule
jtraglia Oct 18, 2024
788fae8
Fix CI linter checks
jtraglia Oct 18, 2024
ab59dca
Maybe fix CI
jtraglia Oct 18, 2024
27847a7
Maybe fix CI lint
jtraglia Oct 18, 2024
e64f951
Change pip to pip3
jtraglia Oct 18, 2024
132fad0
Try manually installing python3
jtraglia Oct 18, 2024
05c9399
Try latest node image
jtraglia Oct 18, 2024
4b130d8
Use node 23
jtraglia Oct 18, 2024
8a7adbd
Apt install python3
jtraglia Oct 18, 2024
a7519ae
Clean things up
jtraglia Oct 18, 2024
fc22d81
Comment out caching
jtraglia Oct 19, 2024
0a22b75
Restore some cache
jtraglia Oct 19, 2024
1e34930
Update cache venv name
jtraglia Oct 19, 2024
c01392c
Use same image for all tasks
jtraglia Oct 19, 2024
f7a860b
Update version number
jtraglia Oct 19, 2024
2e5cdfd
Base eth2spec rule on file in venv
jtraglia Oct 19, 2024
f7cf667
Set venv as an order-only prereq
jtraglia Oct 19, 2024
64f29e3
Split linter config into 3 parts
jtraglia Oct 19, 2024
c269847
Mark setup.py as a dep of eth2spec
jtraglia Oct 19, 2024
13ac2f7
Merge remote-tracking branch 'origin/dev' into refactor-makefile
jtraglia Nov 6, 2024
acfd9b9
Move kzg_setups rule outside of gen_*
jtraglia Nov 6, 2024
344adf2
Merge branch 'dev' into refactor-makefile
jtraglia Dec 3, 2024
85fdc3a
Merge branch 'dev' into refactor-makefile
jtraglia Dec 11, 2024
b232357
Merge branch 'dev' into refactor-makefile
jtraglia Dec 12, 2024
915e9e0
Update cached venv version
jtraglia Dec 12, 2024
46f595d
Remove distribution rules
jtraglia Dec 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Base eth2spec rule on file in venv
  • Loading branch information
jtraglia committed Oct 19, 2024
commit 2e5cdfdc9d8a6d7d1c0ceab8121118d360e13248
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ commands:
description: "Restore the cache with pyspec keys"
steps:
- restore_cached_venv:
venv_name: v28-pyspec
venv_name: v29-pyspec
reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "requirements_preinstallation.txt" }}
save_pyspec_cached_venv:
description: Save a venv into a cache with pyspec keys"
steps:
- save_cached_venv:
venv_name: v28-pyspec
venv_name: v29-pyspec
reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "requirements_preinstallation.txt" }}
venv_path: ./venv
jobs:
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ help:
# Virtual Environment
###############################################################################

VENV = $(CURDIR)/venv
VENV = venv
PYTHON_VENV = $(VENV)/bin/python3
PIP_VENV = $(VENV)/bin/pip3
CODESPELL_VENV = $(VENV)/bin/codespell
Expand Down Expand Up @@ -89,12 +89,12 @@ dist_upload: $(VENV)

TEST_LIBS_DIR = $(CURDIR)/tests/core
PY_SPEC_DIR = $(TEST_LIBS_DIR)/pyspec
ETH2SPEC = $(CURDIR)/.eth2spec
SITE_PACKAGES := $(wildcard $(VENV)/lib/python*/site-packages)
ETH2SPEC := $(SITE_PACKAGES)/eth2spec

# Install the eth2spec package.
$(ETH2SPEC): $(VENV)
@$(PIP_VENV) install .[docs,lint,test,generator]
@touch $(ETH2SPEC)

# Force rebuild/install the eth2spec package.
eth2spec:
Expand Down