Skip to content

Commit b30ba63

Browse files
committed
Merge branch 'main' into sergiym/storage/null_csv
2 parents 4dce274 + 1bed08e commit b30ba63

File tree

68 files changed

+2215
-534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+2215
-534
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
2424
FROM mcr.microsoft.com/vscode/devcontainers/base AS deps-prep
2525
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
2626
&& apt-get -y install --no-install-recommends \
27-
python3-minimal python3-setuptools
27+
python3-minimal python3-venv
2828
COPY --chown=vscode . /tmp/conda-tmp/
2929
RUN /tmp/conda-tmp/prep-deps-files.sh \
3030
&& ls -l /tmp/conda-tmp/ # && cat /tmp/conda-tmp/combined.requirements.txt /tmp/conda-tmp/mlos_deps.yml

.devcontainer/scripts/common/prep-deps-files.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ cat /tmp/conda-tmp/mlos.yml \
2222
| egrep -v -e '--editable' -e '^\s*$' \
2323
| tee /tmp/conda-tmp/mlos_deps.yml
2424

25+
# Use a virtual environment to ensure that we have up to date python libraries.
26+
python3 -m venv /tmp/mlos-venv
27+
source /tmp/mlos-venv/bin/activate
28+
python3 -m pip install -U pip
29+
python3 -m pip install -U setuptools wheel
30+
2531
# Try to grab the requirements.txt files for the python packages.
2632
tmpdir=$(mktemp -d)
2733
get_python_deps() {

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ repos:
8181
args: [--py310-plus]
8282
stages: [pre-commit, manual]
8383
- repo: https://github.com/PyCQA/isort
84-
rev: 6.0.0
84+
rev: 6.0.1
8585
hooks:
8686
- id: isort
8787
require_serial: true
@@ -93,7 +93,7 @@ repos:
9393
- id: black
9494
stages: [pre-commit, manual]
9595
- repo: https://github.com/PyCQA/docformatter
96-
rev: 06907d0 # v1.7.5
96+
rev: v1.7.7
9797
hooks:
9898
- id: docformatter
9999
stages: [pre-commit, manual]

conda-envs/mlos-3.10.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ dependencies:
2525
- check-jsonschema
2626
# Fixed versions for easier maintainability.
2727
# Dependabot can update explicitly as necessary.
28-
- pre-commit==4.1.0
29-
- pycodestyle==2.12.1
30-
- pylint==3.3.4
28+
- pre-commit==4.2.0
29+
- pycodestyle==2.13.0
30+
- pylint==3.3.7
3131
- tomlkit
3232
- mypy==1.15.0
33-
- pyright==1.1.394
33+
- pyright==1.1.400
3434
- pandas-stubs
3535
- types-beautifulsoup4
3636
- types-colorama

conda-envs/mlos-3.11.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ dependencies:
2525
- check-jsonschema
2626
# Fixed versions for easier maintainability.
2727
# Dependabot can update explicitly as necessary.
28-
- pre-commit==4.1.0
29-
- pycodestyle==2.12.1
30-
- pylint==3.3.4
28+
- pre-commit==4.2.0
29+
- pycodestyle==2.13.0
30+
- pylint==3.3.7
3131
- tomlkit
3232
- mypy==1.15.0
33-
- pyright==1.1.394
33+
- pyright==1.1.400
3434
- pandas-stubs
3535
- types-beautifulsoup4
3636
- types-colorama

conda-envs/mlos-3.12.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ dependencies:
2727
- check-jsonschema
2828
# Fixed versions for easier maintainability.
2929
# Dependabot can update explicitly as necessary.
30-
- pre-commit==4.1.0
31-
- pycodestyle==2.12.1
32-
- pylint==3.3.4
30+
- pre-commit==4.2.0
31+
- pycodestyle==2.13.0
32+
- pylint==3.3.7
3333
- tomlkit
3434
- mypy==1.15.0
35-
- pyright==1.1.394
35+
- pyright==1.1.400
3636
- pandas-stubs
3737
- types-beautifulsoup4
3838
- types-colorama

conda-envs/mlos-3.13.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ dependencies:
2727
- check-jsonschema
2828
# Fixed versions for easier maintainability.
2929
# Dependabot can update explicitly as necessary.
30-
- pre-commit==4.1.0
31-
- pycodestyle==2.12.1
32-
- pylint==3.3.4
30+
- pre-commit==4.2.0
31+
- pycodestyle==2.13.0
32+
- pylint==3.3.7
3333
- tomlkit
3434
- mypy==1.15.0
35-
- pyright==1.1.394
35+
- pyright==1.1.400
3636
- pandas-stubs
3737
- types-beautifulsoup4
3838
- types-colorama

conda-envs/mlos-windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ dependencies:
2828
- check-jsonschema
2929
# Fixed versions for easier maintainability.
3030
# Dependabot can update explicitly as necessary.
31-
- pre-commit==4.1.0
32-
- pycodestyle==2.12.1
33-
- pylint==3.3.4
31+
- pre-commit==4.2.0
32+
- pycodestyle==2.13.0
33+
- pylint==3.3.7
3434
- tomlkit
3535
- mypy==1.15.0
36-
- pyright==1.1.394
36+
- pyright==1.1.400
3737
- pandas-stubs
3838
- types-beautifulsoup4
3939
- types-colorama

conda-envs/mlos.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ dependencies:
2323
- check-jsonschema
2424
# Fixed versions for easier maintainability.
2525
# Dependabot can update explicitly as necessary.
26-
- pre-commit==4.1.0
27-
- pycodestyle==2.12.1
28-
- pylint==3.3.4
26+
- pre-commit==4.2.0
27+
- pycodestyle==2.13.0
28+
- pylint==3.3.7
2929
- tomlkit
3030
- mypy==1.15.0
31-
- pyright==1.1.394
31+
- pyright==1.1.400
3232
- pandas-stubs
3333
- types-beautifulsoup4
3434
- types-colorama

mlos_bench/mlos_bench/config/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The [`schemas`](./schemas/) directory contains the [`jsonschema`](https://json-s
4848

4949
For instance including a `"$schema"` attribute at the top of your `json` config file will enable `json` validation and auto-complete in many editors (e.g. [VSCode](https://code.visualstudio.com/)):
5050

51-
Alternatively, you can simply name the file `*.mlos.json` or `*.mlos.jsonc` and the schema will be automatically applied using an [extension](https://marketplace.visualstudio.com/items?itemName=remcohaszing.schemastore) to resolve the rules from \<https://www.schemastore.org/json/
51+
Alternatively, you can simply name the file `*.mlos.json` or `*.mlos.jsonc` and the schema will be automatically applied using an [extension](https://marketplace.visualstudio.com/items?itemName=remcohaszing.schemastore) to resolve the rules from <https://www.schemastore.org/>
5252

5353
```jsonc
5454
{

0 commit comments

Comments
 (0)