Skip to content
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.

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

Update to v0.13.7 #3

Merged
merged 28 commits into from
Nov 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
2e3d4b9
Update to v13.2
marcoesters Sep 16, 2022
7caec3d
Update for rust 1.63.0
marcoesters Sep 16, 2022
0087787
Add abs.yaml
marcoesters Sep 16, 2022
a7e62bc
Update to v13.3
marcoesters Sep 19, 2022
43c74e0
Update URLs
marcoesters Sep 19, 2022
6136e4a
Update license
marcoesters Sep 19, 2022
6371a84
Add build_parameters
marcoesters Sep 20, 2022
bb671fe
Add rust environment
marcoesters Sep 22, 2022
44bfac9
Add C compiler to osx
marcoesters Sep 22, 2022
daa208a
Skip s390x
marcoesters Sep 23, 2022
16f076b
Add posix to test requirements for windows gnu compiler
marcoesters Sep 26, 2022
9cee723
Change white space to re-trigger dispatch
marcoesters Sep 26, 2022
42f68a5
Separate msvc and gnu builds
marcoesters Oct 6, 2022
f1c419a
Remove posix from test requirements
marcoesters Oct 6, 2022
5a92182
Increase build number
marcoesters Oct 6, 2022
a7c89ce
Reset build number
marcoesters Oct 6, 2022
daaa938
Update rust compiler version
marcoesters Oct 26, 2022
5dc5a84
Update to v0.13.6
marcoesters Oct 28, 2022
f7ee2b1
Add pip check
marcoesters Nov 1, 2022
9adcc32
Update about
marcoesters Nov 1, 2022
18ea7a9
Update to v0.13.7
marcoesters Nov 1, 2022
7ea7dd3
Update checksum
marcoesters Nov 1, 2022
4a5dc34
Add pip to test requirements
marcoesters Nov 1, 2022
bfe5dd8
Add additional tests
marcoesters Nov 2, 2022
6c57b8b
Update python pinnings
marcoesters Nov 2, 2022
88b19c5
Move build sections
marcoesters Nov 2, 2022
2cabd40
Change license logic
marcoesters Nov 2, 2022
dd6692e
Remove abs.yaml
marcoesters Nov 9, 2022
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
11 changes: 9 additions & 2 deletions recipe/bld.bat → recipe/bld-win.bat
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
REM Based on bld.bat from pysyntect-feedstock
REM https://github.com/conda-forge/pysyntect-feedstock/

REM Set up rust environment
set CARGO_HOME=%CONDA_PREFIX%\.cargo.win
set CARGO_CONFIG=%CARGO_HOME%\config
set RUSTUP_HOME=%CARGO_HOME%\rustup

echo "Building %PKG_NAME%"

REM Create temp folder
mkdir tmpbuild_%PY_VER%
set TEMP=%CD%\tmpbuild_%PY_VER%
mkdir %CD%\tmpbuild_%PKG_NAME%_%PY_VER%
set TEMP=%CD%\tmpbuild_%PKG_NAME%_%PY_VER%

REM Print Rust version
rustc --version
Expand Down
8 changes: 4 additions & 4 deletions recipe/build.sh → recipe/build-unix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# https://github.com/conda-forge/pysyntect-feedstock/
set -ex

# Set conda CC as custom CC in Rust
export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=$CC
export CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER=$CC
export CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER=$CC
# Set up rust environment
export CARGO_HOME=${CONDA_PREFIX}/.cargo.$(uname)
export CARGO_CONFIG=${CARGO_HOME}/config
export RUSTUP_HOME=${CARGO_HOME}/rustup

# Print Rust version
rustc --version
Expand Down
5 changes: 2 additions & 3 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# Please consult conda-forge/core before doing this
MACOSX_SDK_VERSION: # [osx and x86_64]
- "10.12" # [osx and x86_64]
rust_compiler_version:
- 1.64.0
101 changes: 72 additions & 29 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,49 +1,92 @@
{% set name = "maturin" %}
{% set version = "0.11.5" %}
{% set version = "0.13.7" %}

package:
name: {{ name }}
name: {{ name }}-suite
version: {{ version }}

source:
url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
sha256: 07074778b063a439fdfd5501bd1d1823a216ec5b657d3ecde78fd7f2c4782422
sha256: c0a77aa0c57f945649ca711c806203a1b6888ad49c2b8b85196ffdcf0421db77

build:
number: 1
skip: true # [py27]
missing_dso_whitelist: # [osx]
- /usr/lib/libresolv.9.dylib # [osx]
number: 0
# ring (dependency loaded via cargo) is not supported on s390x yet
# https://github.com/briansmith/ring/issues/1511
skip: True # [py<37 or s390x or py>310]

requirements:
build:
- python # [build_platform != target_platform]
- cross-python_{{ target_platform }} # [build_platform != target_platform]
- {{ compiler('c') }} # [unix]
- {{ compiler('m2w64_c') }} # [win]
# seems to work with defaults from conda-forge-pinning (at the moment)
- rust # [not osx]
# investigating...
- rust >=1.54 # [osx]
host:
- pip
- python
- toml
run:
- python
- toml >=0.10.2,<0.11

test:
commands:
- maturin --help
outputs:
- name: {{ name }}
script: bld-win.bat # [win]
script: build-unix.sh # [not win]
missing_dso_whitelist: # [osx]
- /usr/lib/libresolv.9.dylib # [osx]
requirements:
build:
- {{ compiler('c') }}
- {{ compiler('rust') }} # [not win]
- rust_win-64 # [win]
host:
- pip
- python
- setuptools
- setuptools-rust >=1.4.0
- wheel >=0.36.2
- tomli >=1.1.0
run:
- python
- tomli >=1.1.0
test:
imports:
- maturin
requires:
skupr-anaconda marked this conversation as resolved.
Show resolved Hide resolved
- pip
commands:
- maturin -V
- maturin --help
- maturin build --help
- pip check
- name: {{ name }}-gnu # [win]
script: bld-win.bat # [win]
requirements: # [win]
build: # [win]
- {{ compiler('m2w64_c') }} # [win]
- rust-gnu_win-64 # [win]
host: # [win]
- pip # [win]
- python # [win]
- setuptools # [win]
- setuptools-rust >=1.4.0 # [win]
- wheel >=0.36.2 # [win]
- tomli >=1.1.0 # [win]
run: # [win]
- python # [win]
- tomli >=1.1.0 # [win]
test: # [win]
imports: # [win]
- maturin # [win]
requires: # [win]
- pip # [win]
commands: # [win]
- maturin -V # [win]
- maturin --help # [win]
skupr-anaconda marked this conversation as resolved.
Show resolved Hide resolved
- maturin build --help # [win]
- pip check # [win]

about:
home: https://github.com/PyO3/maturin
license: MIT
home: https://maturin.rs/
license: MIT OR Apache-2.0
license_family: MIT
license_file: license-mit
summary: >-
Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages
description: |
This project is meant as a zero configuration replacement for setuptools-rust and milksnake.
It supports building wheels for python 3.5+ on windows, linux, mac and freebsd, can upload them to pypi and has basic pypy support.
dev_url: https://github.com/PyO3/maturin
doc_url: https://maturin.rs/
doc_source_url: https://github.com/PyO3/maturin/tree/v{{ version }}/guide/src

extra:
recipe-maintainers:
Expand Down