Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
0b37608
Working? version of rusty state
shreyashankar Aug 18, 2023
c35e559
Working version with lists and dicts
shreyashankar Aug 18, 2023
ad20cfb
Supposedly even more optimized rust
shreyashankar Aug 18, 2023
fc1831e
Successfully imported bare bones library version
shreyashankar Aug 18, 2023
de7bbce
Rebase with main
shreyashankar Aug 26, 2023
10eacbf
Rebase with main
shreyashankar Aug 26, 2023
56bd45d
Rebase with main
shreyashankar Aug 26, 2023
0d0e79c
Using serde for serialization
shreyashankar Aug 20, 2023
b1a8603
Switch to microsoft picologging
shreyashankar Aug 21, 2023
2d09532
Make sure tests pass
shreyashankar Nov 23, 2023
05649f0
Make sure tests pass
shreyashankar Nov 24, 2023
216a58c
Make mypy work
shreyashankar Nov 24, 2023
2d481c2
Tests should pass
shreyashankar Nov 24, 2023
d032240
Modify pyproject.toml
shreyashankar Nov 24, 2023
c0d8a7a
Try to run CI
shreyashankar Nov 24, 2023
ad73b0a
Try to run CI
shreyashankar Nov 24, 2023
9299ca0
Try to run CI
shreyashankar Nov 24, 2023
751c2fb
Restructure to match maturin documentation for mixed libraries
shreyashankar Nov 25, 2023
12efa49
Restructure to match maturin documentation for mixed libraries
shreyashankar Nov 25, 2023
c21eb97
Change ci file to use make commands
shreyashankar Nov 25, 2023
632a293
Check that version is bumped up automatically
shreyashankar Nov 25, 2023
c1807c4
Check that version is bumped up automatically
shreyashankar Nov 25, 2023
da83fd8
Check that version is bumped up automatically
shreyashankar Nov 25, 2023
351290b
Bump version
shreyashankar Nov 25, 2023
aac9cb3
Give new major version 0.2
shreyashankar Nov 25, 2023
1b04815
Test pypi
shreyashankar Nov 25, 2023
8bc16f2
Properly handle python versions in CD
shreyashankar Nov 25, 2023
5d5c554
Properly handle python versions in CD
shreyashankar Nov 25, 2023
b34ef89
Properly handle python versions in CD
shreyashankar Nov 25, 2023
17749f6
Get test pypi push to work
shreyashankar Nov 25, 2023
4d59152
Fix formatting error
shreyashankar Nov 25, 2023
1c25ee0
Try to get CD to work
shreyashankar Nov 25, 2023
2e9a67c
Try to fix CD
shreyashankar Nov 25, 2023
b4874cb
Add test pypi token
shreyashankar Nov 25, 2023
c81b491
Fix cargo tests
shreyashankar Nov 25, 2023
e117ad2
Merge branch 'main' into shreyashankar/removelock
shreyashankar Dec 5, 2023
76bac35
Fix library
shreyashankar Dec 5, 2023
7fbbae4
Pre check with cache ttl
shreyashankar Dec 8, 2023
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
123 changes: 123 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
# This file is autogenerated by maturin v0.14.17
# To update, run
#
# maturin generate-ci github
#
name: CD

on:
push:
branches:
- main
- master
tags:
- "*"
pull_request:
workflow_dispatch:

permissions:
contents: read

jobs:
linux:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Build wheels
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.target }}
args: -i python${{ matrix.python-version }} --release --out dist
sccache: "true"
manylinux: auto
- name: Upload wheels
uses: actions/upload-artifact@v3
with:
name: wheels
path: dist

windows:
runs-on: windows-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
target: [x64, x86]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.target }}
- name: Build wheels
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.target }}
args: --release --out dist --find-interpreter
sccache: "true"
- name: Upload wheels
uses: actions/upload-artifact@v3
with:
name: wheels
path: dist

macos:
runs-on: macos-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
target: [x86_64, aarch64]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Build wheels
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.target }}
args: --release --out dist --find-interpreter
sccache: "true"
- name: Upload wheels
uses: actions/upload-artifact@v3
with:
name: wheels
path: dist

sdist:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Build sdist
uses: PyO3/maturin-action@v1
with:
command: sdist
args: --out dist
- name: Upload sdist
uses: actions/upload-artifact@v3
with:
name: wheels
path: dist

release:
name: Release
runs-on: ubuntu-latest
needs: [linux, windows, macos, sdist]
steps:
- uses: actions/download-artifact@v3
with:
name: wheels
- name: Publish to TestPyPI
uses: messense/maturin-action@v1
env:
MATURIN_PYPI_TOKEN: ${{ secrets.TEST_PYPI_API_TOKEN }}
MATURIN_REPOSITORY: "testpypi"
with:
command: upload
args: --skip-existing *
37 changes: 36 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: motion
name: CI

on:
workflow_dispatch:
Expand All @@ -19,6 +19,30 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2

- name: Fetch main branch
run: git fetch origin main

- name: Get current version from main branch
id: main_version
run: |
MAIN_VERSION=$(git show origin/main:pyproject.toml | grep '^version =' | awk -F '"' '{print $2}')
echo "Main branch version: $MAIN_VERSION"
echo "MAIN_VERSION=$MAIN_VERSION" >> $GITHUB_ENV

- name: Get version from current branch
id: current_version
run: |
CURRENT_VERSION=$(grep '^version =' pyproject.toml | awk -F '"' '{print $2}')
echo "Current branch version: $CURRENT_VERSION"
echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV

- name: Check if version is bumped
run: |
if [[ "$CURRENT_VERSION" == "$MAIN_VERSION" ]]; then
echo "Error: Version in current branch is not bumped from main branch"
exit 1
fi

- name: Start Redis
run: |
retries=3
Expand All @@ -35,9 +59,20 @@ jobs:
- name: Install Poetry
uses: snok/install-poetry@v1

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: true

- name: Install dependencies
run: poetry install

- name: Build and install
run: |
make build

- name: Run pytest
run: make tests

Expand Down
67 changes: 0 additions & 67 deletions .github/workflows/publish.yml

This file was deleted.

10 changes: 6 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ dist*
site*
*package-lock.json
projects
unnecessary.py
motionstate*
*.whl
*.so
*rustc*
*motionenv*
*.whl
*unnecessary*
target*
.motionenv*
unnecessary.py
motionstate*
Loading