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

Fixes #249, adds dependencies for PyPI packaging and updates CI tests #250

Merged
merged 31 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
19ed46b
add deps to pyproject.toml
pluflou Sep 26, 2024
1e7414e
test numpy 2.1
pluflou Sep 26, 2024
a366d66
test w/ pip only
pluflou Sep 26, 2024
b384277
add openmpi to dev deps for testing with pip
pluflou Sep 26, 2024
59c54c2
add binaries to test pip installation
pluflou Sep 26, 2024
008be24
add binaries to test pip installation
pluflou Sep 26, 2024
0fef8cd
add binaries to test pip installation
pluflou Sep 26, 2024
0ce85bd
add binaries to test pip installation
pluflou Sep 26, 2024
49a8bb1
add binaries to test pip installation
pluflou Sep 26, 2024
5c70a0b
add binaries to test pip installation
pluflou Sep 26, 2024
5efdda0
check python version in test env
pluflou Sep 26, 2024
4191e4f
check python version in test env
pluflou Sep 26, 2024
6aad835
check python version in test env
pluflou Sep 26, 2024
11591d9
check python version in test env
pluflou Sep 26, 2024
367b927
check python version in test env
pluflou Sep 26, 2024
50b9cca
check python version in test env
pluflou Sep 26, 2024
26e184d
test w/ pip only
pluflou Sep 26, 2024
d4ea996
test w/ pip only
pluflou Sep 26, 2024
a063c77
test w/ pip only
pluflou Sep 26, 2024
b153b98
test w/ pip only
pluflou Sep 26, 2024
934c0c0
test w/ pip only w/o python version specified
pluflou Sep 26, 2024
babcf84
test w/ pip only w/o python version specified
pluflou Sep 26, 2024
d77e802
test w/ pip only w/ cache
pluflou Sep 26, 2024
e93364d
test w/ pip only w/ cache
pluflou Sep 26, 2024
828aa32
test w/ pip only w/ cache
pluflou Sep 26, 2024
0c7f540
update cache rules
pluflou Sep 26, 2024
ae2bd06
update cache rules
pluflou Sep 26, 2024
749e097
clean up conda action
pluflou Sep 26, 2024
3f250bc
update environment.yml
pluflou Sep 26, 2024
c870211
test conda install w/o cache
pluflou Sep 26, 2024
c31ffd5
finalize conda action
pluflou Sep 26, 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
9 changes: 7 additions & 2 deletions .github/actions/conda-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,18 @@ runs:
- name: Update environment
shell: bash -l {0}
run: |
if [ -f "${{ inputs.filename }}" ]; then
if [ -f "${{ inputs.filename }}" ] && ! [ "${{ steps.cache.outputs.cache-hit }}" ] ; then
mamba env update -n ${{ inputs.env_name }} -f ${{ inputs.filename }}
else
echo "No conda environment file found; skipping. Path: ${{ inputs.filename }}"
mamba install -n ${{ inputs.env_name }} python=${{ inputs.python-version }}
fi
if: steps.cache.outputs.cache-hit != 'true'
- name: Install required binaries for MPI
shell: bash -l {0}
run: |
if ! grep -q ${{ inputs.filename }} ; then
sudo apt install libopenmpi-dev
fi
- name: Setup the environment
shell: bash -l {0}
run: |
Expand Down
8 changes: 2 additions & 6 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dependencies:
- ipywidgets
- tqdm
- orjson
- matplotlib
# parallel
- mpi4py
- dask
Expand All @@ -24,16 +25,11 @@ dependencies:
- jupyterlab>=3
- jupyterlab-lsp
- python-lsp-server
- matplotlib
- pygments
- mkdocs
- mkdocstrings
- mkdocs-material
# NOTE: we are installing mkdocs-jupyter with pip for now
# due to the following: https://github.com/conda-forge/mkdocs-jupyter-feedstock/issues/31
# - mkdocs-jupyter
- mkdocs-jupyter
- mkdocstrings-python
- ruff
- typing-extensions
- pip:
- mkdocs-jupyter>=0.24.7
22 changes: 20 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,17 @@ classifiers = [
"Topic :: Scientific/Engineering",
]
dependencies = [
# All core dependencies must be sourced from conda (conda-forge).
# See ``environment.yml`` for further information.
"deap",
"numpy",
"pydantic>=2.3",
"pyyaml",
"botorch>=0.9.2,<=0.10.0",
"scipy>=1.10.1",
"pandas",
"ipywidgets",
"tqdm",
"orjson",
"matplotlib"
]
description = "Flexible optimization of arbitrary problems in Python."
dynamic = [ "version" ]
Expand All @@ -31,6 +40,15 @@ requires-python = ">=3.9"
dev = [
"pytest",
"pytest-cov",
"ffmpeg",
"pytest",
"pytest-cov",
"jupyterlab>=3",
"jupyterlab-lsp",
"python-lsp-server",
"pygments",
"dask",
"mpi4py"
]
doc = [
"mkdocs",
Expand Down
Loading