From c5a649e2aecc3e968aba32e64ba2f45167d2ef94 Mon Sep 17 00:00:00 2001
From: Elvis Pranskevichus <elvis@magic.io>
Date: Fri, 30 Mar 2018 23:09:00 -0400
Subject: immutables v0.2

---
 .ci/build-manylinux-wheels.sh |  4 ++--
 .ci/travis-build-wheels.sh    |  3 +--
 .travis.yml                   | 12 +++---------
 immutables/__init__.py        |  2 +-
 tests/__init__.py             |  4 +++-
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.ci/build-manylinux-wheels.sh b/.ci/build-manylinux-wheels.sh
index 6d78104..0cab659 100755
--- a/.ci/build-manylinux-wheels.sh
+++ b/.ci/build-manylinux-wheels.sh
@@ -8,7 +8,7 @@ PIP="/opt/python/${PYTHON_VERSION}/bin/pip"
 ${PIP} install --upgrade pip wheel
 ${PIP} install --upgrade setuptools
 ${PIP} install -r /io/.ci/requirements.txt
-make -C /io/ PYTHON="${PYTHON}"
+rm -rf /io/build
 ${PIP} wheel /io/ -w /io/dist/
 
 # Bundle external shared libraries into the wheels.
@@ -25,5 +25,5 @@ PYTHON="/opt/python/${PYTHON_VERSION}/bin/python"
 PIP="/opt/python/${PYTHON_VERSION}/bin/pip"
 ${PIP} install ${PYMODULE} --no-index -f file:///io/dist
 rm -rf /io/tests/__pycache__
-make -C /io/ PYTHON="${PYTHON}" testinstalled
+"${PYTHON}" /io/tests/__init__.py
 rm -rf /io/tests/__pycache__
diff --git a/.ci/travis-build-wheels.sh b/.ci/travis-build-wheels.sh
index 92771bd..a7fafb9 100755
--- a/.ci/travis-build-wheels.sh
+++ b/.ci/travis-build-wheels.sh
@@ -58,12 +58,11 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
 elif [ "${TRAVIS_OS_NAME}" == "osx" ]; then
     export PGINSTALLATION="/usr/local/opt/postgresql@${PGVERSION}/bin"
 
-    make clean && make -C "${_root}"
     pip wheel "${_root}" -w "${_root}/dist/"
 
     pip install ${PYMODULE} --no-index -f "file:///${_root}/dist"
     pushd / >/dev/null
-    make -C "${_root}" testinstalled
+    python "${_root}/tests/__init__.py"
     popd >/dev/null
 
     _upload_wheels
diff --git a/.travis.yml b/.travis.yml
index ebafe4d..60c7eb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,7 @@ env:
 
         - S3_UPLOAD_USERNAME=oss-ci-bot
         - S3_UPLOAD_BUCKET=magicstack-oss-releases
-        # S3_UPLOAD_ACCESSKEY:
-        - secure: "iU37gukuyeaYM69StkR/aUTNgolblBdw2is034evvrm/SG0bKyzVVSrcK/dts9jolkCxJi+01VfpzxIBu2PF11QnCN1exUILb+XfmR+dVxUnNY2M1qqjILHvQ92rFJ9f2TlbYa2AlwgKynZlY4+edVSACSWwD/+TbWGAQEp0WInalA8ohljir+EPueXaYyC8mmH55cNQIa5WdDA2Vpg5ahRDdhVyD2J+/fLg78syLV7FGlnpXtASo9XiQKmRpPyHIT23yQB444kVh9xcjvuiB3aUBP5bGC2H4unElGYhCvfQvb1GoWvDqyvfzZvTOjlHqnG4AvIPoSCgEu/9cu8Cm/9OxWtqtWy7dECM8ZUIlOi3oPcvwUYDpNYAdATbTr1T6FRCBEp2eOi3sKoeE+nUDgQaN4r+ple4BKYnjrsSllXhI5W8ZqDNoUSsoGu+z6GFn6Dszrj6jbq8JHV4mZT9RCfR1y6inXWYGmaNRlwzm8wPHTav2RbW2O6bbwkkATWwYpyRB2FRlwMX6BB06druZWNOzx09RS8pTHnqcKOXW2mENNMgrA03OJUEV30UG/ncLZELYTpBARSJwymxjmmTK7vEI/HfxHkPrKcLLPPn2GoWym7mF2Lkh+jp81FkCGYrLTquyKPaoeUsofYukWMbGwE99ePL5dLocVDqTzatAoU="
-        # S3_UPLOAD_SECRET:
-        - secure: "uCcM67fmT3ODhaHrUKhuid/DJZzy9aMtaVdRCkAkjaF/X0Dgj1Dq9bV/PPLn+HjVIRiloHKK4fk6eMLmnI/PWPnTD7hVYse2ECLEeTxZGtoBmTdBPzdf1+aHpl18o8xbN/XfO02SVk6pTHDSjZIwR8ZeiZ2Q75aY462BW9WBgV0JOL9xK5yJd3TjODsDJpwcK0P4TMwi1j2qKIpXMUJaZkyUPafZIykil2CbcePd2Y5AUfDN2BAqaJZqM9vVCeRRs7ECzCamBPsj2WUmXqs621IH3Ml/sSONCzeQoUlgUsG2a7b+Jic92sVsFHyLVqG56G5urIAsXm+Jc/8Ly/dTk1M3ER/OdvsB0z21mhQfaVHwROixPk6HPCbvTl3PITEauaU+wLwCIduiEbb6fcpoB11n3oRzgiLY5e4+QDA86LBNySDhBE8WIq1VKphgTp7ojgM/mHJg4VBZX3m+89JruUOLi49VPx1cK/CiWEBj3gWHZMNDL9agS5N/fwl6UnD5DAklTZtqlA5M2FZ8/aPN8/FgW4jTEgBBU87Ko2rTvVRmKZeCVEkIBS2lYsRDTG3ZmlyJuh2AGGReUzCh524pNAsonIF2ydCOzLv4DlTZSthOwbdnX0EMBRYuPEa436dgkVUUVP6ds5859IPZeXcN6JKJWPWQkzFWFwzoK9ttQLc="
-
-        - TWINE_USERNAME: magicstack-ci
-        # TWINE_PASSWORD:
-        - secure: "jyc9xHK3VjGPxvBZKx8Mcf5nfVvfIyGn6b4atcrmwVdJsV1bBLdKoAjUX3RGjNGyAHpNYOEKOdNfeZs+Wziwg5NK7ucC5qybaBK3MOTEOInCzaO0QJpcxThaHBQkkDxVtn8Qu1Gk3S/hXcXWjT2UEYJvQ84diaXn/XYRxfzOYTZX8eUroAWOMnUCYxlPxGzXTAtmuQSiJkL7P7veZTsWsGCOHtCpdAx7dgGb113CD8QheeUoZlH9Ml6jd3fGFteYmuFp7cR6fa3VYVzxp5BFsdEJqSI4VqDvBOpUoLkbpRRKMjosHKtphfi0PAzbkJw6UdKcrqQ/Ca4nGmWk0PIf3LTsJrv44p4ZTPVI8b3lihXMm72QUE28e11yu9SIZRe0hMgmvWlivXEJw3C3YT1N5w+JM3Y5dIWp/YLoiRXVkIzNJQMN3YeWvKEFf/xO1AD2BO3jjU9oBZfKQpxCJ58gPsQrRt6qM3Y6zYuF8s4B+llpwM/ex2xnNwrTbNkp4ARyXyCujX+ixhjiBLtElfGoHPP1jOaIkJhGje9DxaptddfFBDLAdq0/3Q+LHOmwdQcH5+libUy3HnyP7jf51kjjWE3XEJGSchHI2ewEAn9UZRH8h0UNRXutBzUVvKgC6K1lUvqzEreKVxvrYe6zgbZc/DiUvLgIzJBiJgP9rdZYpDQ="
+        - TWINE_USERNAME=magicstack-ci
 
 branches:
     # Avoid building PR branches.
@@ -38,10 +31,11 @@ matrix:
 
         - os: linux
           dist: trusty
-          sudo: false
+          sudo: required
           language: python
           python: "3.6"
           env: BUILD=tests,wheels,release
+          services: [docker]
 
         - os: osx
           env: BUILD=tests,wheels PYTHON_VERSION=3.5.4 PIP_USER=1
diff --git a/immutables/__init__.py b/immutables/__init__.py
index 48deb49..ffeef0f 100644
--- a/immutables/__init__.py
+++ b/immutables/__init__.py
@@ -2,4 +2,4 @@ from ._map import Map
 
 
 __all__ = 'Map',
-__version__ = '0.1'
+__version__ = '0.2'
diff --git a/tests/__init__.py b/tests/__init__.py
index fa393d9..450c573 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,10 +1,12 @@
+import os.path
 import sys
 import unittest
 
 
 def suite():
     test_loader = unittest.TestLoader()
-    test_suite = test_loader.discover('.', pattern='test_*.py')
+    test_suite = test_loader.discover(os.path.dirname(__file__),
+                                      pattern='test_*.py')
     return test_suite
 
 
-- 
cgit v1.2.3