8000 Ship Cargo.lock in the source distribution by cpcloud · Pull Request #1508 · apache/datafusion · GitHub
[go: up one dir, main page]
Skip to content

Ship Cargo.lock in the source distribution #1508

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

Closed
wants to merge 4 commits into from
Closed

Ship Cargo.lock in the source distribution #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e355c0
Ship Cargo.lock in the source distribution
cpcloud Dec 30, 2021
b1a570a
Add ci check that python/Cargo.lock is up to date
cpcloud Dec 30, 2021
f00f3bc
Add Cargo.lock to PR CI
cpcloud Dec 30, 2021
fcd6aad
Make sure commands that aren't pytest exit early
cpcloud Dec 30, 2021
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
7 changes: 7 additions & 0 deletions .github/workflows/python_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ jobs:
- name: Build Python package
run: maturin build --release --no-sdist --strip

- name: Check that the lock file is up to date
run: git diff --exit-code Cargo.lock
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you use --frozen and --locked per doc

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, great idea. Thanks


- name: List Windows wheels
if: matrix.os == 'windows-latest'
run: dir target\wheels\
Expand Down Expand Up @@ -111,6 +114,10 @@ jobs:
--workdir /io/python \
konstin2/maturin:v0.11.2 \
build --release --manylinux 2010

- name: Check that the lock file is up to date
run: git diff --exit-code Cargo.lock

- name: Archive wheels
uses: actions/upload-artifact@v2
with:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/python_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,12 @@ jobs:
black --line-length 79 --diff --check python
- name: Run tests
run: |
set -euo pipefail

source venv/bin/activate
cd python
maturin develop
git diff --exit-code Cargo.lock
RUST_BACKTRACE=1 pytest -v .
env:
CARGO_HOME: "/home/runner/.cargo"
Expand Down
28 changes: 14 additions & 14 deletions python/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,6 @@ repository = "https://github.com/apache/arrow-datafusion"

[tool.isort]
profile = "black"

[tool.maturin]
sdist-include = ["Cargo.lock"]
0