Merge pull request #85 from clbarnes/maturin

WIP: maturin (formerly pyo3-pack)

setup.cfg → .bumpversion.cfg

@@ -14,13 +14,3 @@ replace = __version__ = "{new_version}"
 [bumpversion:file:Cargo.toml]
 search = version = "{current_version}"
 replace = version = "{new_version}"
-
-[bdist_wheel]
-universal = 1
-
-[flake8]
-exclude = docs
-
-[aliases]
-test = pytest
-

.editorconfig

@@ -11,6 +11,9 @@ charset = utf-8
 end_of_line = lf
 max_line_length = 98
 
+[*.yml]
+indent_size = 2
+
 [*.bat]
 indent_style = tab
 end_of_line = crlf

.gitignore

@@ -24,6 +24,7 @@ wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+pip-wheel-metadata/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

.travis.yml

@@ -1,59 +1,41 @@
 language: python
+dist: xenial
 python:
-  - 3.5
+  - 3.7
 
 stages:
   - test
   - name: deploy
-    if: tag IS present
+    if: (branch = master) AND (tag =~ ^v\d+.*$)
 env:
   global:
   - TRAVIS_RUST_VERSION=nightly-2019-07-01
   - RUST_BACKTRACE=1
-  - TWINE_USERNAME=pattonw
 
 test_template: &test_template
   stage: test
   before_install:
-    source ./ci/travis/setup_rust.sh
+    - source ./ci/travis/setup_rust.sh
   install:
-    pip install -U tox-travis setuptools_rust
+    - make install-dev
   script:
-    ./ci/travis/test.sh
-
-deploy_template: &deploy_template
-  stage: deploy
-  sudo: required
-  services:
-    docker
-  env:
-    - CIBW_BUILD=cp35-*
-  install:
-    pip install -U cibuildwheel
-  script:
-    ./ci/travis/build.sh
-
+    - make test
 
 jobs:
   include:
     - <<: *test_template
+      name: "test py36"
       python: 3.6
     - <<: *test_template
-      dist: xenial
-      python: 3.7
-      sudo: required
-    - <<: *deploy_template
-      env:
-        - CIBW_BUILD=cp36-*
-    - <<: *deploy_template
-      env:
-        - CIBW_BUILD=cp37-*
+      name: "test py37"
     - stage: deploy
+      addons:
+        apt:
+          packages:
+            - python3.6
+      before_install:
+        - source ./ci/travis/setup_rust.sh
+      install:
+        - pip install maturin==0.7.2
       script:
-        echo "skip"
-      deploy:
-        distributions: sdist
-        password:
-          secure: VeZNGpUs5ne3ZlCeZLPbT+3O6yRDM9sv8emg6m90ZwLuZAlXV0t2dGHKccMTBMbS2jWSy2q4TY2IkN0SOWrOmi53Klt3K5Y461Ra8dT+XdmXK8g+36HJEJKWfFvVpYVuIw72yoUWHZsr2iNxi7tiAc/AjBvbnbgSXuAayuVm+8K7tQ85kkfbdBErDQnhziEiqtIrjak3hwBgjWpm0UEuAKG/eTBFk0BAN9wqRajCS58WLaLVnF4FtAHT4QAxo33j99njB7cz8PLjXNd3BxT2BpMbjqmg8krVW7ayMJKdLvWdICezPB4nlsnL9jBlXMaRvI0ijSl59QkVCDbkrERUCR7IdJZqAX3IFSe+9X1cwzJsJeXYOfQjYMX+ZyqR8qcmQKS6M1u3uYMXhoj+TU9uO0sK4dNxrS0DRhg22TdjAcpqnz0UDVVWfFapltroE0ePVPs8aOOqdpJewRDPDI0ghRg/nzrSIhEI+85XnSTcjm4if5hwiEFchIFlV5d/ZIHtPn+b0fCRTDMq4kjObxD9uBbVvda1+CESCNrE91oB1erlrjygsDnpdRWi5dzaOVe5DJmAxT/V5mPFlskOPJLZr3lzZOQm1FGVJbvTN766plDCWozTAG8wT58hq/nJTBIiRjHlQnhFjlHLkaWTEq/jJ8mA++KXvbofCy833V0OMrw=
-        provider: pypi
-        user: pattonw
+        - maturin publish -u pattonw -p PYPI_PASSWORD -i python3.6 -i python3.7