Skip to content

Commit

Permalink
Modifications to make the pip deployment (hopefully) work (#837)
Browse files Browse the repository at this point in the history
  • Loading branch information
WillJRoper authored Feb 13, 2025
2 parents d4758d7 + 1d2863c commit 67f953b
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
name: pypi-deployment
url: https://pypi.org/p/cosmos-synthesizer
permissions:
id-token: write
id-token: write

steps:
- name: Download all the dists
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ jobs:
# is not set up properly and depends on numpy and cython, the former
# we depend on, the latter we need to install)
pip install cython
WITH_OPENMP=1 pip install .[bluetides,eagle,illustris,dense_basis]
WITH_OPENMP=1 pip install .[bluetides,eagle]
pip install "illustris_python @ git+https://github.com/illustristng/illustris_python.git@master"
pip install "dense_basis@git+https://github.com/kartheikiyer/dense_basis"
# Output the compilation report so it can be viewed in an action log
cat build_synth.log
- uses: astral-sh/ruff-action@v1 # Lint with Ruff
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install wheel
pip install -e .[docs,dense_basis]
pip install -e .[docs]
pip install "dense_basis@git+https://github.com/kartheikiyer/dense_basis"
sudo apt install pandoc
- name: Download test data
run: |
Expand Down
11 changes: 0 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,6 @@ bluetides = [
eagle = [
"schwimmbad",
]
illustris = [
"illustris_python @ git+https://github.com/illustristng/illustris_python.git@master",
]

# Optional dependency for using dense_basis (note that we
# currently have to use the main branch since the PyPi version
# hasn't been updated with a fix we required)
dense_basis = [
"dense_basis@git+https://github.com/kartheikiyer/dense_basis",
]


# Project urls
[project.urls]
Expand Down
4 changes: 2 additions & 2 deletions src/synthesizer/load_data/load_illustris.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
except ImportError:
raise UnmetDependency(
"The `illustris_python` module is required to load IllustrisTNG data. "
"Install synthesizer with the `illustris` extra dependencies:"
" `pip install .[illustris]`."
"Install it via `pip install 'illustris_python @ "
"git+https://github.com/illustristng/illustris_python.git@master'"
)


Expand Down

0 comments on commit 67f953b

Please sign in to comment.