Skip to content

Commit ef66d83

Browse files
bpkrothDelphianCalamity
authored andcommitted
CI fixups (microsoft#783)
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
1 parent 1ae116d commit ef66d83

File tree

10 files changed

+40
-22
lines changed

10 files changed

+40
-22
lines changed

conda-envs/mlos-3.10.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ dependencies:
3838
- types-pygments
3939
- types-requests
4040
- types-setuptools
41-
- "--editable ../mlos_core[full-tests]"
42-
- "--editable ../mlos_bench[full-tests]"
43-
- "--editable ../mlos_viz[full-tests]"
41+
# Workaround a pylance issue in vscode that prevents it finding the latest
42+
# method of pip installing editable modules.
43+
# https://github.com/microsoft/pylance-release/issues/3473
44+
- "--config-settings editable_mode=compat --editable ../mlos_core[full-tests]"
45+
- "--config-settings editable_mode=compat --editable ../mlos_bench[full-tests]"
46+
- "--config-settings editable_mode=compat --editable ../mlos_viz[full-tests]"

conda-envs/mlos-3.11.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ dependencies:
3838
- types-pygments
3939
- types-requests
4040
- types-setuptools
41-
- "--editable ../mlos_core[full-tests]"
42-
- "--editable ../mlos_bench[full-tests]"
43-
- "--editable ../mlos_viz[full-tests]"
41+
# Workaround a pylance issue in vscode that prevents it finding the latest
42+
# method of pip installing editable modules.
43+
# https://github.com/microsoft/pylance-release/issues/3473
44+
- "--config-settings editable_mode=compat --editable ../mlos_core[full-tests]"
45+
- "--config-settings editable_mode=compat --editable ../mlos_bench[full-tests]"
46+
- "--config-settings editable_mode=compat --editable ../mlos_viz[full-tests]"

conda-envs/mlos-3.8.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ dependencies:
3838
- types-pygments
3939
- types-requests
4040
- types-setuptools
41-
- "--editable ../mlos_core[full-tests]"
42-
- "--editable ../mlos_bench[full-tests]"
43-
- "--editable ../mlos_viz[full-tests]"
41+
# Workaround a pylance issue in vscode that prevents it finding the latest
42+
# method of pip installing editable modules.
43+
# https://github.com/microsoft/pylance-release/issues/3473
44+
- "--config-settings editable_mode=compat --editable ../mlos_core[full-tests]"
45+
- "--config-settings editable_mode=compat --editable ../mlos_bench[full-tests]"
46+
- "--config-settings editable_mode=compat --editable ../mlos_viz[full-tests]"

conda-envs/mlos-3.9.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ dependencies:
3838
- types-pygments
3939
- types-requests
4040
- types-setuptools
41-
- "--editable ../mlos_core[full-tests]"
42-
- "--editable ../mlos_bench[full-tests]"
43-
- "--editable ../mlos_viz[full-tests]"
41+
# Workaround a pylance issue in vscode that prevents it finding the latest
42+
# method of pip installing editable modules.
43+
# https://github.com/microsoft/pylance-release/issues/3473
44+
- "--config-settings editable_mode=compat --editable ../mlos_core[full-tests]"
45+
- "--config-settings editable_mode=compat --editable ../mlos_bench[full-tests]"
46+
- "--config-settings editable_mode=compat --editable ../mlos_viz[full-tests]"

conda-envs/mlos-windows.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ dependencies:
4242
- types-requests
4343
- types-setuptools
4444
- pyarrow
45-
- "--editable ../mlos_core[full-tests]"
46-
- "--editable ../mlos_bench[full-tests]"
47-
- "--editable ../mlos_viz[full-tests]"
45+
# Workaround a pylance issue in vscode that prevents it finding the latest
46+
# method of pip installing editable modules.
47+
# https://github.com/microsoft/pylance-release/issues/3473
48+
- "--config-settings editable_mode=compat --editable ../mlos_core[full-tests]"
49+
- "--config-settings editable_mode=compat --editable ../mlos_bench[full-tests]"
50+
- "--config-settings editable_mode=compat --editable ../mlos_viz[full-tests]"

conda-envs/mlos.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ dependencies:
3737
- types-pygments
3838
- types-requests
3939
- types-setuptools
40-
- "--editable ../mlos_core[full-tests]"
41-
- "--editable ../mlos_bench[full-tests]"
42-
- "--editable ../mlos_viz[full-tests]"
40+
# Workaround a pylance issue in vscode that prevents it finding the latest
41+
# method of pip installing editable modules.
42+
# https://github.com/microsoft/pylance-release/issues/3473
43+
- "--config-settings editable_mode=compat --editable ../mlos_core[full-tests]"
44+
- "--config-settings editable_mode=compat --editable ../mlos_bench[full-tests]"
45+
- "--config-settings editable_mode=compat --editable ../mlos_viz[full-tests]"

mlos_bench/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools", "setuptools-scm>=8.1.0", "wheel"]
2+
requires = ["setuptools>64", "setuptools-scm>=8.1.0", "wheel"]
33
build-backend = "setuptools.build_meta"
44

55
[project]

mlos_bench/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def _get_long_desc_from_readme(base_url: str) -> dict:
7070
extra_requires: Dict[str, List[str]] = { # pylint: disable=consider-using-namedtuple-or-dataclass
7171
# Additional tools for extra functionality.
7272
'azure': ['azure-storage-file-share', 'azure-identity', 'azure-keyvault'],
73-
'ssh': ['asyncssh'],
73+
'ssh': ['asyncssh<2.15.0'], # FIXME: asyncssh 2.15.0 has a bug that breaks the tests
7474
'storage-sql-duckdb': ['sqlalchemy', 'duckdb_engine'],
7575
'storage-sql-mysql': ['sqlalchemy', 'mysql-connector-python'],
7676
'storage-sql-postgres': ['sqlalchemy', 'psycopg2'],

mlos_core/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools", "setuptools-scm>=8.1.0", "wheel"]
2+
requires = ["setuptools>64", "setuptools-scm>=8.1.0", "wheel"]
33
build-backend = "setuptools.build_meta"
44

55
[project]

mlos_viz/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools", "setuptools-scm>=8.1.0", "wheel"]
2+
requires = ["setuptools>64", "setuptools-scm>=8.1.0", "wheel"]
33
build-backend = "setuptools.build_meta"
44

55
[project]

0 commit comments

Comments
 (0)