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

loosen dependency requirement pins for nebari #2984

Merged
merged 33 commits into from
Mar 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
114b4d5
loosen reqs for nebari_doctor
Adam-D-Lewis Mar 5, 2025
faa8266
loosen dependency reqs
Adam-D-Lewis Mar 10, 2025
4383b97
Merge branch 'main' into nebari_doctor
Adam-D-Lewis Mar 10, 2025
e890ff1
remove unneeded dependency
Adam-D-Lewis Mar 10, 2025
fe7bf67
simplify test
Adam-D-Lewis Mar 10, 2025
b1b48e8
update
Adam-D-Lewis Mar 10, 2025
1fb0589
fix typo
Adam-D-Lewis Mar 10, 2025
915ca80
ensure nebari built locally
Adam-D-Lewis Mar 10, 2025
37187e5
force local nebari install
Adam-D-Lewis Mar 10, 2025
5e7715f
ensure local nebari used
Adam-D-Lewis Mar 10, 2025
9883ac4
fix
Adam-D-Lewis Mar 10, 2025
f93f2c2
fix
Adam-D-Lewis Mar 10, 2025
b043417
simplify
Adam-D-Lewis Mar 10, 2025
adb2922
try this
Adam-D-Lewis Mar 10, 2025
f2087ca
fix
Adam-D-Lewis Mar 10, 2025
5d57109
add
Adam-D-Lewis Mar 10, 2025
8aefcb9
debug
Adam-D-Lewis Mar 10, 2025
a8362dc
fix
Adam-D-Lewis Mar 10, 2025
5848811
debug
Adam-D-Lewis Mar 10, 2025
22fd4ac
debug
Adam-D-Lewis Mar 10, 2025
d1b706c
debug
Adam-D-Lewis Mar 10, 2025
02f2b4e
try
Adam-D-Lewis Mar 10, 2025
863610f
try
Adam-D-Lewis Mar 10, 2025
af32e52
update
Adam-D-Lewis Mar 10, 2025
06283a3
try
Adam-D-Lewis Mar 10, 2025
bde3e5c
try
Adam-D-Lewis Mar 10, 2025
a501994
try
Adam-D-Lewis Mar 10, 2025
17fbd98
check this
Adam-D-Lewis Mar 10, 2025
2641fff
ensure that this makes CI fail again
Adam-D-Lewis Mar 11, 2025
88dfec4
maybe this was the fix for the CICD issue?
Adam-D-Lewis Mar 11, 2025
5c1621b
revert all changes to file and see if it passes
Adam-D-Lewis Mar 11, 2025
1b1d364
Revert "revert all changes to file and see if it passes"
Adam-D-Lewis Mar 11, 2025
b165994
remove comments
Adam-D-Lewis Mar 11, 2025
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
20 changes: 16 additions & 4 deletions .github/workflows/test_conda_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,16 @@ jobs:
python-version: "3.10"
channels: conda-forge
activate-environment: nebari-dev
conda-remove-defaults: true

- name: Install dependencies
run: |
conda install build grayskull conda-build conda-verify
conda install grayskull conda-build conda-verify
pip install build

- name: Conda list
run: |
conda list

- name: Generate sdist
run: |
Expand All @@ -50,9 +56,15 @@ jobs:

- name: Build conda package
run: |
conda build nebari
conda build . --output-folder conda-bld

# Store the path for the next step
echo "CONDA_BLD_PATH=$(pwd)/conda-bld" >> $GITHUB_ENV

- name: Test conda package
run: |
conda install --use-local nebari
nebari --version
NEBARI_VERSION=$(conda search -c local --override-channels nebari --json | jq -r '.nebari[0].version')

conda create -n test-env -c file://${{ env.CONDA_BLD_PATH }} "nebari=$NEBARI_VERSION"

conda run -n test-env --live-stream nebari --version
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies = [
"bcrypt==4.0.1",
"boto3==1.34.63",
"cloudflare==2.11.7",
"google-auth==2.31.0",
"google-auth>=2.31.0,<3.0.0",
"google-cloud-compute==1.19.1",
"google-cloud-container==2.49.0",
"google-cloud-iam==2.15.1",
Expand All @@ -72,12 +72,12 @@ dependencies = [
"kubernetes==27.2.0",
"pluggy==1.3.0",
"prompt-toolkit==3.0.36",
"pydantic==2.9.2",
"pydantic>=2.9.2,<3.0.0",
"pynacl==1.5.0",
"python-keycloak>=3.9.0,<4.0.0",
"questionary==2.0.0",
"requests-toolbelt==1.0.0",
"rich==13.5.1",
"rich>=13.5.1,<14",
"ruamel.yaml==0.18.6",
"typer==0.9.0",
"packaging==23.2",
Expand All @@ -90,7 +90,6 @@ dev = [
"coverage[toml]",
"dask-gateway",
"escapism",
"importlib-metadata<5.0",
"mypy==1.6.1",
"paramiko",
"pre-commit",
Expand Down
6 changes: 1 addition & 5 deletions tests/tests_unit/test_stages.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,14 @@ def test_check_immutable_fields_mutable_change(


@patch.object(TerraformStateStage, "get_nebari_config_state")
@patch.object(schema.Main, "model_fields")
def test_check_immutable_fields_immutable_change(
mock_model_fields, mock_get_state, terraform_state_stage, mock_config
mock_get_state, terraform_state_stage, mock_config
):
old_config = mock_config.model_copy(deep=True)
old_config.local = None
old_config.provider = schema.ProviderEnum.gcp
mock_get_state.return_value = old_config.model_dump()

# Mock the provider field to be immutable
mock_model_fields.__getitem__.return_value.json_schema_extra = {"immutable": True}

Comment on lines -60 to -62
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

provider field is already marked as immutable, so this is not necessary to mock it

with pytest.raises(ValueError) as exc_info:
terraform_state_stage.check_immutable_fields()

Expand Down
Loading