Skip to content

Commit

Permalink
update cargo.toml and rust toolchain
Browse files Browse the repository at this point in the history
bump version
stole pipelines from cryptography + orjson for publishing wheels
bump version 0.1.3, hopefully ci jobs works
  • Loading branch information
Aviram Hassan authored and aviramha committed Jan 8, 2020
1 parent bf2aea8 commit 1ba68ba
Show file tree
Hide file tree
Showing 8 changed files with 191 additions and 8 deletions.
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
[package]
name = "rfernet"
version = "0.1.0"
version = "0.1.3"
authors = ["Aviram Hassan <[email protected]>"]
description = "Fast Fernet bindings for Python"
license = "MIT"
edition = "2018"
keywords = ["fast", "fernet"]
readme = "README.md"

include = [
"Cargo.toml",
# "CHANGELOG.md",
# "LICENSE",
"LICENSE",
"pyproject.toml",
# "README.md",
"README.md",
"rust-toolchain",
"src/*",
# "test/*.py",
"test/*.py",
# "test/requirements.txt",
]

Expand All @@ -24,11 +25,10 @@ name = "rfernet"
crate-type = ["cdylib"]

[package.metadata.maturin]
requires-python = ">=3.7"
requires-python = ">=3.6"
classifier = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"License :: OSI Approved :: Apache Software License",
"License :: OSI Approved :: MIT License",
"Operating System :: MacOS",
"Operating System :: Microsoft :: Windows",
Expand Down
5 changes: 5 additions & 0 deletions ci/azure-linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
steps:
- bash: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly --profile minimal -y
displayName: rustup
- bash: source $HOME/.cargo/env && rustup default nightly
displayName: ensure nightly
27 changes: 27 additions & 0 deletions ci/azure-macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@

parameters:
interpreter: ''
manylinux: ''
target: ''

steps:
- bash: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly --profile minimal -y
displayName: rustup
- bash: /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
- bash: brew update
displayName: Update brew
- bash: brew install [email protected]
displayName: Install OpenSSL with brew
- bash: $(interpreter) -m pip install --user --upgrade pip wheel maturin twine pytest
displayName: build dependencies
- bash: PATH=/Users/runner/.local/bin:$HOME/.cargo/bin:$PATH OPENSSL_STATIC=yes OPENSSL_LIB_DIR=/usr/local/opt/[email protected]/lib/ OPENSSL_INCLUDE_DIR=/usr/local/opt/[email protected]/include RUSTFLAGS="-C target-feature=+sse2" maturin build --release --strip --manylinux $(manylinux) --interpreter $(interpreter) --target $(target)
displayName: build
- bash: $(interpreter) -m pip install target/wheels/rfernet*.whl
displayName: install
- bash: $(interpreter) -m pytest -vrxXs
displayName: pytest
- bash: $(interpreter) -m twine upload target/wheels/*.whl
displayName: publish
env:
TWINE_PASSWORD: $(TWINE_PASSWORD)
TWINE_USERNAME: $(TWINE_USERNAME)
111 changes: 111 additions & 0 deletions ci/azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
jobs:

- job: linux_python37_sdist
pool:
vmImage: ubuntu-16.04
variables:
interpreter: python3.7
target: x86_64-unknown-linux-gnu
steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.7'
addToPath: true
- checkout: self
- template: ./azure-linux.yml
parameters:
dependencies: apt
- template: ./azure-sdist.yml

- job: manylinux1_python38
pool:
vmImage: ubuntu-16.04
container: aviramhassan/manylinux1_gcc:x86_64
variables:
interpreter: /opt/python/cp38-cp38/bin/python3.8
manylinux: 1
path: /opt/python/cp38-cp38/bin:/opt/python/cp38-cp38/lib:/home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
target: x86_64-unknown-linux-gnu
steps:
- checkout: self
- template: ./azure-linux.yml
parameters:
dependencies: apt
- template: ./azure-posix.yml

- job: manylinux1_python37
pool:
vmImage: ubuntu-16.04
container: aviramhassan/manylinux1_gcc:x86_64
variables:
interpreter: /opt/python/cp37-cp37m/bin/python3.7
manylinux: 1
target: x86_64-unknown-linux-gnu
path: /opt/python/cp37-cp37m/bin:/opt/python/cp37-cp37m/lib:/home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
steps:
- checkout: self
- template: ./azure-linux.yml
parameters:
dependencies: apt
- template: ./azure-posix.yml

- job: manylinux1_python36
pool:
vmImage: ubuntu-16.04
container: aviramhassan/manylinux1_gcc:x86_64
variables:
interpreter: /opt/python/cp36-cp36m/bin/python3.6
manylinux: 1
target: x86_64-unknown-linux-gnu
path: /opt/python/cp36-cp36m/bin:/opt/python/cp36-cp36m/lib:/home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
steps:
- checkout: self
- template: ./azure-linux.yml
parameters:
dependencies: apt
- template: ./azure-posix.yml

- job: macos_python38
pool:
vmImage: xcode9-macos10.13
variables:
interpreter: python3.8
manylinux: off
target: x86_64-apple-darwin
steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.8'
addToPath: true
- checkout: self
- template: ./azure-macos.yml

- job: macos_python37
pool:
vmImage: xcode9-macos10.13
variables:
interpreter: python3.7
manylinux: off
target: x86_64-apple-darwin
steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.7'
addToPath: true
- checkout: self
- template: ./azure-macos.yml

- job: macos_python36
pool:
vmImage: xcode9-macos10.13
variables:
interpreter: python3.6
manylinux: off
target: x86_64-apple-darwin
steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.6'
addToPath: true
- checkout: self
- template: ./azure-macos.yml
23 changes: 23 additions & 0 deletions ci/azure-posix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
parameters:
interpreter: ''
manylinux: ''
target: ''

steps:
- bash: $(interpreter) -m pip install virtualenv
displayName: install venv
- bash: $(interpreter) -m virtualenv .venv
displayName: setup venv
- bash: PATH=$(path) .venv/bin/pip install --upgrade pip wheel maturin mypy twine pytest
displayName: build dependencies
- bash: PATH=$HOME/.cargo/bin:$PATH OPENSSL_STATIC=yes OPENSSL_LIB_DIR=/opt/pyca/cryptography/openssl/lib OPENSSL_INCLUDE_DIR=/opt/pyca/cryptography/openssl/include RUSTFLAGS="-C target-feature=+sse2" .venv/bin/maturin build --release --strip --manylinux $(manylinux) --interpreter $(interpreter) --target $(target)
displayName: build
- bash: PATH=$(path) .venv/bin/pip install target/wheels/rfernet*.whl
displayName: install
- bash: .venv/bin/pytest -vrxXs
displayName: pytest
- bash: PATH=$(path) .venv/bin/twine upload target/wheels/*.whl
displayName: publish
env:
TWINE_PASSWORD: $(TWINE_PASSWORD)
TWINE_USERNAME: $(TWINE_USERNAME)
16 changes: 16 additions & 0 deletions ci/azure-sdist.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
parameters:
interpreter: ''
target: ''

steps:
- bash: pip install --upgrade pip wheel twine maturin
displayName: build dependencies
- bash: maturin sdist
displayName: package sdist
- bash: pip install target/wheels/rfernet*.tar.gz
displayName: install
- bash: twine upload target/wheels/*.tar.gz
displayName: publish
env:
TWINE_PASSWORD: $(TWINE_PASSWORD)
TWINE_USERNAME: $(TWINE_USERNAME)
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[tool.poetry]
name = "rfernet"
version = "0.1.0"
version = "0.1.3"
description = "Fast Fernet bindings for Python"
authors = ["Aviram Hassan <[email protected]>"]
license = "MIT"

[tool.poetry.dependencies]
python = "^3.7"
python = "^3.6"

[tool.poetry.dev-dependencies]
pytest = "^5.3"
Expand Down
1 change: 1 addition & 0 deletions rust-toolchain
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nightly

0 comments on commit 1ba68ba

Please sign in to comment.