8000 Merge pull request #19 from davidblewett/use-milksnake · davidblewett/rure-python@626dcbb · GitHub
[go: up one dir, main page]
Skip to content

Commit 626dcbb

Browse files
davidblewettdavidblewett
authored
Merge pull request #19 from davidblewett/use-milksnake
Refactor dependency and build process
2 parents da161e1 + 15b0e53 commit 626dcbb

File tree

256 files changed

+225841
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

256 files changed

+225841
-299
lines changed

‎.dockerignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/usr/local/rustup/toolchains/*/lib
2+
/usr/local/rustup/toolchains/*/share
3+
build/
4+
dist/

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@ _ffi.py
22
*.dylib
33
*.dll
44
*.so
5+
_native.py
6+
_native__ffi.py
7+
.eggs/
8+
build/
9+
dist/

‎.travis.yml

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,18 @@
1+
language: python
2+
3+
services:
4+
- docker
5+
16
cache:
27
directories:
38
- /root/.cache/pip
49
- /root/.cargo
510

6-
env:
7-
global:
8-
- RURE_DIR=/opt/regex/regex-capi
9-
- REGEX_TAG=0.2.1
10-
11-
install:
12-
- docker pull $DOCKER_IMAGE
13-
14-
language: python
15-
16-
matrix:
17-
include:
18-
- sudo: required
19-
services:
20-
- docker
21-
env: DOCKER_IMAGE=quay.io/davidblewett/manylinux_rure
22-
- sudo: required
23-
services:
24-
- docker
25-
env: DOCKER_IMAGE=quay.io/davidblewett/manylinux_rure
26-
PRE_CMD=linux32
11+
before_install:
12+
- docker build -t davidblewett/rure-python:$TRAVIS_COMMIT .
2713

2814
notifications:
2915
email: false
3016

3117
script:
32-
- docker run -e "RURE_DIR=$RURE_DIR" -e "REGEX_TAG=$REGEX_TAG" --rm -v `pwd`:/io $DOCKER_IMAGE $PRE_CMD /io/travis/build-wheels.sh
33-
- ls /io/wheelhouse/
18+
- docker run davidblewett/rure-python:$TRAVIS_COMMIT /bin/sh -c "python -m unittest discover -s /root/rure/tests"

‎Dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM quay.io/pypa/manylinux1_x86_64
2+
COPY --from=rust:latest /usr/local/cargo/ /usr/local/cargo/
3+
COPY --from=rust:latest /usr/local/rustup/ /usr/local/rustup/
4+
5+
WORKDIR /root/
6+
COPY . .
7+
8+
ENV CARGO_HOME=/usr/local/cargo \
9+
PATH="/usr/local/cargo/bin:/opt/python/cp37-cp37m/bin:$PATH" \
10+
RUSTUP_HOME=/usr/local/rustup
11+
12+
RUN rustc --version && \
13+
cargo --version
14+
15+
RUN pip install -e .

‎HISTORY.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
History
33
=======
44

5+
0.2.1 (2019-04-07)
6+
------------------
7+
8+
* Update build pipeline to support multiple Python versions
9+
* Binary wheels compiled against:
10+
11+
* Rust: 1.33.0
12+
* regex: 1.0
13+
* rure (regex-capi): 0.2.1
14+
515
0.2.0 (2018-03-04)
616
------------------
717

‎regex/.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
target
2+
Cargo.lock
3+
bench-log
4+
.*.swp
5+
wiki
6+
tags
7+
examples/debug.rs
8+
tmp/

‎regex/.travis.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
dist: trusty
2+
sudo: required
3+
language: rust
4+
rust:
5+
- 1.24.1
6+
- stable
7+
- beta
8+
- nightly
9+
script: ci/script.sh
10+
addons:
11+
apt:
12+
packages:
13+
- libcurl4-openssl-dev
14+
- libelf-dev
15+
- libdw-dev
16+
- binutils-dev
17+
- wget
18+
- clang-3.6
19+
- cmake
20+
- python
21+
- python-virtualenv
22+
after_success: ci/after_success.sh
23+
notifications:
24+
email:
25+
on_success: never
26+
branches:
27+
only:
28+
- master
29+
- auto

0 commit comments

Comments
 (0)
0