Skip to content

Commit

Permalink
Trying out maturin. (#344)
Browse files Browse the repository at this point in the history
* Trying out maturin.

* Yaml.

* We don't need lock right now.

* Dont skip.

* Working dir.

* Default working dir.

* Wroking dir here ?

* Fix ls

* Maturin makes things simpler.

* Clippy.

* New version number

* Update conda build.

* Conda.

* Conda.

* Drop 3.7, add 3.11

* Linux update 3.11

* Version

* Done.

* Remove afl

* Put rust code also in dev mode.

* Pre-release requires explicit everywhere.

* Remove manual sdist

* Remove custom builds

* Requires lock

* Fix sdist.

* Sed.
  • Loading branch information
Narsil committed Aug 25, 2023
1 parent abc3027 commit 73db0c8
Show file tree
Hide file tree
Showing 15 changed files with 226 additions and 503 deletions.
2 changes: 1 addition & 1 deletion .github/conda/bld.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cd bindings\python
%PYTHON% setup.py install --prefix=%PREFIX%
%PYTHON% -m pip install . --prefix=%PREFIX%
2 changes: 1 addition & 1 deletion .github/conda/build.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cd bindings/python
$PYTHON setup.py install --prefix=$PREFIX
$PYTHON -m pip install . --prefix=$PREFIX
1 change: 1 addition & 0 deletions .github/conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ requirements:
- python x.x
- setuptools
- setuptools-rust
- maturin

run:
- python x.x
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/python-release-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
os: [windows-latest, macos-latest]
# 3.11 not available on Conda yet.
python: ["3.7", "3.8", "3.9", "3.10"]
python: ["3.8", "3.9", "3.10", "3.11"]

steps:
- name: Checkout repository
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Extract version
shell: bash -l {0}
working-directory: ./bindings/python
run: echo "SAFETENSORS_VERSION=`python setup.py --version`" >> $GITHUB_ENV
run: echo "SAFETENSORS_VERSION=`grep -m 1 version Cargo.toml | grep -e '".*"' -o | tr -d '"' | sed s/-/./ `" >> $GITHUB_ENV

- name: Build conda packages
shell: bash -l {0}
Expand All @@ -66,14 +66,16 @@ jobs:
strategy:
fail-fast: false
matrix:
python: [37, 38, 39]
python: [38, 39, 310, 311]
include:
- python: 37
checksum: a1a7285dea0edc430b2bc7951d89bb30a2a1b32026d2a7b02aacaaa95cf69c7c
- python: 38
checksum: 935d72deb16e42739d69644977290395561b7a6db059b316958d97939e9bdf3d
checksum: e2a4438671e0e42c5bba14cb51de6ce9763938184d6ca2967340bbe972bbe7e6
- python: 39
checksum: 1ea2f885b4dbc3098662845560bc64271eb17085387a70c2ba3f29fff6f8d52f
checksum: 9829d95f639bd0053b2ed06d1204e60644617bf37dd5cc57523732e0e8d64516
- python: 310
checksum: ea5e6e8a3d5a0247b9df85382d27220fac8e59b5778fd313c5913879cd9baafc
- python: 311
checksum: 634d76df5e489c44ade4085552b97bebc786d49245ed1a830022b0b406de5817

steps:
- name: Checkout repository
Expand All @@ -82,7 +84,7 @@ jobs:
- name: Install miniconda
run: |
yum install -y wget openssl-devel
export FILENAME=Miniconda3-py${{ matrix.python }}_4.10.3-Linux-x86_64.sh
export FILENAME=Miniconda3-py${{ matrix.python }}_23.5.2-0-Linux-x86_64.sh
wget https://repo.anaconda.com/miniconda/$FILENAME
sha256sum $FILENAME | awk '$1=="${{ matrix.checksum}}"{print"good to go"}'
bash $FILENAME -b -p $HOME/miniconda
Expand Down Expand Up @@ -115,7 +117,7 @@ jobs:
working-directory: ./bindings/python
run: |
source $HOME/miniconda/bin/activate
echo "SAFETENSORS_VERSION=`python setup.py --version`" >> $GITHUB_ENV
echo "SAFETENSORS_VERSION=`grep -m 1 version Cargo.toml | grep -e '".*"' -o | tr -d '"' | sed s/-/./ `" >> $GITHUB_ENV
- name: Build conda packages
shell: bash -l {0}
Expand Down
120 changes: 0 additions & 120 deletions .github/workflows/python-release-extra.yml

This file was deleted.

Loading

0 comments on commit 73db0c8

Please sign in to comment.