Skip to content

Commit 10b3fa1

Browse files
authored
Merge branch 'main' into fix/sqlframe-replace-strict-pass
2 parents f9997a2 + 352542c commit 10b3fa1

File tree

4 files changed

+19
-38
lines changed

4 files changed

+19
-38
lines changed

.github/workflows/downstream_tests.yml

Lines changed: 13 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,10 @@ jobs:
5050
run: |
5151
cd altair
5252
pytest tests
53-
# Temporarily commented-out to get CI green
54-
# https://github.com/narwhals-dev/narwhals/issues/3013
55-
# - name: Run mypy
56-
# run: |
57-
# cd altair
58-
# mypy altair tests
53+
- name: Run mypy
54+
run: |
55+
cd altair
56+
mypy altair tests
5957
6058
marimo:
6159
strategy:
@@ -78,35 +76,22 @@ jobs:
7876
cache-dependency-glob: "pyproject.toml"
7977
- name: clone-marimo
8078
run: |
81-
git clone https://github.com/marimo-team/marimo.git --depth=1
79+
# TODO: remove branch pin once https://github.com/marimo-team/marimo/pull/8510 is merged
80+
git clone https://github.com/marimo-team/marimo.git --depth=1 --branch=push-kmswtyynuukw
8281
cd marimo
83-
uv venv -p 3.12
8482
git log
85-
- name: install-basics
86-
run:
87-
uv pip install --upgrade tox virtualenv setuptools hatch
88-
"click!=8.3.0" --system
89-
- name: install-marimo-dev
83+
- name: install-narwhals-dev
9084
run: |
9185
cd marimo
92-
. .venv/bin/activate
86+
uv add ../ --editable
9387
# Temporary pin until it's addressed upstream.
94-
uv pip install "pandas<3"
88+
uv add "pandas<3" --group test-optional
9589
# Temporary pin to get CI green
96-
uv pip install "sqlglot<28.7.0"
97-
uv pip install -e ".[dev]"
98-
which python
99-
- name: install-narwhals-dev
100-
run: |
101-
cd marimo
102-
. .venv/bin/activate
103-
uv pip uninstall narwhals
104-
uv pip install -e ./..
90+
uv add "sqlglot<28.7.0" --group test-optional
10591
- name: show-deps
10692
run: |
10793
cd marimo
108-
. .venv/bin/activate
109-
uv pip freeze
94+
uv tree --group test-optional
11095
- name: Create assets directory, copy over index.html
11196
continue-on-error: true
11297
run: |
@@ -117,12 +102,8 @@ jobs:
117102
if: ${{ matrix.dependencies == 'core,optional' }}
118103
run: |
119104
cd marimo
120-
. .venv/bin/activate
121-
# make sure that we use the .venv when running tests, so that
122-
# the local narwhals install is picked up
123-
sed -i '/^\[tool.hatch.envs.default\]/a path = ".venv"' pyproject.toml
124-
hatch run python -c "import narwhals; print(narwhals.__file__)"
125-
hatch run +py=${{ matrix.python-version }} test-optional:test-narwhals
105+
uv run --python ${{ matrix.python-version }} python -c "import narwhals; print(narwhals.__file__)"
106+
scripts/test-narwhals.sh --python=${{ matrix.python-version }}
126107
timeout-minutes: 15
127108

128109
scikit-lego:

.github/workflows/publish_to_pypi.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Check wheel content
3333
run: python3 utils/check_dist_content.py
3434
- name: Store the distribution packages
35-
uses: actions/upload-artifact@v6
35+
uses: actions/upload-artifact@v7
3636
with:
3737
name: python-package-distributions
3838
path: dist/
@@ -52,7 +52,7 @@ jobs:
5252

5353
steps:
5454
- name: Download all the dists
55-
uses: actions/download-artifact@v7
55+
uses: actions/download-artifact@v8
5656
with:
5757
name: python-package-distributions
5858
path: dist/
@@ -71,7 +71,7 @@ jobs:
7171
id-token: write # IMPORTANT: mandatory for sigstore
7272
steps:
7373
- name: Download all the dists
74-
uses: actions/download-artifact@v7
74+
uses: actions/download-artifact@v8
7575
with:
7676
name: python-package-distributions
7777
path: dist/

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ci:
33
repos:
44
- repo: https://github.com/astral-sh/ruff-pre-commit
55
# Ruff version.
6-
rev: 'v0.15.0'
6+
rev: 'v0.15.4'
77
hooks:
88
# Run the formatter.
99
- id: ruff-format
@@ -23,7 +23,7 @@ repos:
2323
exclude: ^docs/api-completeness.md$
2424
- repo: https://github.com/adhtruong/mirrors-typos
2525
# Use mirror to avoid autoupdate issue: https://github.com/crate-ci/typos/issues/390
26-
rev: 'v1.42.3'
26+
rev: 'v1.44.0'
2727
hooks:
2828
- id: typos
2929
- repo: https://github.com/pycqa/flake8

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024, Marco Gorelli
3+
Copyright (c) 2024 to present, Marco Gorelli
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)