Skip to content

Commit

Permalink
CI fixups (microsoft#783)
Browse files Browse the repository at this point in the history
1. Temporarily avoid recent asyncssh version that breaks the tests
2. Workaround pylance issue with pyproject.toml related changes and pip
editable modules install format (microsoft#768)
   See Also: 
   - microsoft/pylance-release#3473
   May also affect `mypy`:
   - python/mypy#16988
   - python/mypy#12313
  • Loading branch information
bpkroth authored and DelphianCalamity committed Jul 12, 2024
1 parent 1ae116d commit ef66d83
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 22 deletions.
9 changes: 6 additions & 3 deletions conda-envs/mlos-3.10.yml
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
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
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
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
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
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
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
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
'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
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
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

0 comments on commit ef66d83

Please sign in to comment.