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.

Sign up for GitHub

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

CI fixups #783

Merged
merged 5 commits into from
Jul 10, 2024
Merged

CI fixups #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee1e0f9
Temporarily avoid recent asyncssh version that breaks the tests
bpkroth Jul 10, 2024
113792a
Workaround pylance issue with pyproject.toml related changes and pip …
bpkroth Jul 10, 2024
ffa060e
Workaround pylance issue with pyproject.toml related changes and pip …
bpkroth Jul 10, 2024
e9b197c
ensure a recent enough version of setuptools
bpkroth Jul 10, 2024
ed31260
Merge branch 'pylance-fixup' into ci-fixups
bpkroth Jul 10, 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: 6 additions & 3 deletions conda-envs/mlos-3.10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ dependencies:
- types-pygments
- types-requests
- types-setuptools
- "--editable ../mlos_core[full-tests]"
- "--editable ../mlos_bench[full-tests]"
- "--editable ../mlos_viz[full-tests]"
# Workaround a pylance issue in vscode that prevents it finding the latest
# method of pip installing editable modules.
# https://github.com/microsoft/pylance-release/issues/3473
- "--config-settings editable_mode=compat --editable ../mlos_core[full-tests]"
- "--config-settings editable_mode=compat --editable ../mlos_bench[full-tests]"
- "--config-settings editable_mode=compat --editable ../mlos_viz[full-tests]"
9 changes: 6 additions & 3 deletions conda-envs/mlos-3.11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ dependencies:
- types-pygments
- types-requests
- types-setuptools
- "--editable ../mlos_core[full-tests]"
- "--editable ../mlos_bench[full-tests]"
- "--editable ../mlos_viz[full-tests]"
# Workaround a pylance issue in vscode that prevents it finding the latest
# method of pip installing editable modules.
# https://github.com/microsoft/pylance-release/issues/3473
- "--config-settings editable_mode=compat --editable ../mlos_core[full-tests]"
- "--config-settings editable_mode=compat --editable ../mlos_bench[full-tests]"
- "--config-settings editable_mode=compat --editable ../mlos_viz[full-tests]"
9 changes: 6 additions & 3 deletions conda-envs/mlos-3.8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ dependencies:
- types-pygments
- types-requests
- types-setuptools
- "--editable ../mlos_core[full-tests]"
- "--editable ../mlos_bench[full-tests]"
- "--editable ../mlos_viz[full-tests]"
# Workaround a pylance issue in vscode that prevents it finding the latest
# method of pip installing editable modules.
# https://github.com/microsoft/pylance-release/issues/3473
- "--config-settings editable_mode=compat --editable ../mlos_core[full-tests]"
- "--config-settings editable_mode=compat --editable ../mlos_bench[full-tests]"
- "--config-settings editable_mode=compat --editable ../mlos_viz[full-tests]"
9 changes: 6 additions & 3 deletions conda-envs/mlos-3.9.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ dependencies:
- types-pygments
- types-requests
- types-setuptools
- "--editable ../mlos_core[full-tests]"
- "--editable ../mlos_bench[full-tests]"
- "--editable ../mlos_viz[full-tests]"
# Workaround a pylance issue in vscode that prevents it finding the latest
# method of pip installing editable modules.
# https://github.com/microsoft/pylance-release/issues/3473
- "--config-settings editable_mode=compat --editable ../mlos_core[full-tests]"
- "--config-settings editable_mode=compat --editable ../mlos_bench[full-tests]"
- "--config-settings editable_mode=compat --editable ../mlos_viz[full-tests]"
9 changes: 6 additions & 3 deletions conda-envs/mlos-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ dependencies:
- types-requests
- types-setuptools
- pyarrow
- "--editable ../mlos_core[full-tests]"
- "--editable ../mlos_bench[full-tests]"
- "--editable ../mlos_viz[full-tests]"
# Workaround a pylance issue in vscode that prevents it finding the latest
# method of pip installing editable modules.
# https://github.com/microsoft/pylance-release/issues/3473
- "--config-settings editable_mode=compat --editable ../mlos_core[full-tests]"
- "--config-settings editable_mode=compat --editable ../mlos_bench[full-tests]"
- "--config-settings editable_mode=compat --editable ../mlos_viz[full-tests]"
9 changes: 6 additions & 3 deletions conda-envs/mlos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ dependencies:
- types-pygments
- types-requests
- types-setuptools
- "--editable ../mlos_core[full-tests]"
- "--editable ../mlos_bench[full-tests]"
- "--editable ../mlos_viz[full-tests]"
# Workaround a pylance issue in vscode that prevents it finding the latest
# method of pip installing editable modules.
# https://github.com/microsoft/pylance-release/issues/3473
- "--config-settings editable_mode=compat --editable ../mlos_core[full-tests]"
- "--config-settings editable_mode=compat --editable ../mlos_bench[full-tests]"
- "--config-settings editable_mode=compat --editable ../mlos_viz[full-tests]"
2 changes: 1 addition & 1 deletion mlos_bench/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools", "setuptools-scm>=8.1.0", "wheel"]
requires = ["setuptools>64", "setuptools-scm>=8.1.0", "wheel"]
build-backend = "setuptools.build_meta"

[project]
Expand Down
2 changes: 1 addition & 1 deletion mlos_bench/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def _get_long_desc_from_readme(base_url: str) -> dict:
extra_requires: Dict[str, List[str]] = { # pylint: disable=consider-using-namedtuple-or-dataclass
# Additional tools for extra functionality.
'azure': ['azure-storage-file-share', 'azure-identity', 'azure-keyvault'],
'ssh': ['asyncssh'],
'ssh': ['asyncssh<2.15.0'], # FIXME: asyncssh 2.15.0 has a bug that breaks the tests
motus marked this conversation as resolved.
Show resolved Hide resolved
'storage-sql-duckdb': ['sqlalchemy', 'duckdb_engine'],
'storage-sql-mysql': ['sqlalchemy', 'mysql-connector-python'],
'storage-sql-postgres': ['sqlalchemy', 'psycopg2'],
Expand Down
2 changes: 1 addition & 1 deletion mlos_core/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools", "setuptools-scm>=8.1.0", "wheel"]
requires = ["setuptools>64", "setuptools-scm>=8.1.0", "wheel"]
build-backend = "setuptools.build_meta"

[project]
Expand Down
2 changes: 1 addition & 1 deletion mlos_viz/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools", "setuptools-scm>=8.1.0", "wheel"]
requires = ["setuptools>64", "setuptools-scm>=8.1.0", "wheel"]
build-backend = "setuptools.build_meta"

[project]
Expand Down
Loading