Merge pull request #1 from python-trio/ci

Fix CI

Author: njsmith

.appveyor.yml

@@ -24,9 +24,7 @@ build_script:
   - "pip install codecov"
 
 test_script:
-  - "mkdir empty"
-  - "cd empty"
   # Make sure it's being imported from where we expect
   - "python -c \"import os, outcome; print(os.path.dirname(outcome.__file__))\""
-  - "python -u -m pytest -W error -ra -v -s --pyargs outcome --cov=outcome --cov-config=../.coveragerc"
+  - "python -u -m pytest -W error -ra -v -s --cov --cov-config=.coveragerc"
   - "codecov"

.coveragerc

@@ -1,8 +1,8 @@
 [run]
-branch=True
-source=
+branch = True
+source =
     outcome
-    tests
+    tests/
 
 [report]
 precision = 1

README.rst

@@ -11,7 +11,7 @@
    :alt: Automated test status (Linux and MacOS)
 
 .. image:: https://ci.appveyor.com/api/projects/status/c54uu4rxlgs2usmj/branch/master?svg=true
-   :target: https://ci.appveyor.com/project/python-trio/outcome/history
+   :target: https://ci.appveyor.com/project/RazerM/outcome/history
    :alt: Automated test status (Windows)
 
 .. image:: https://codecov.io/gh/python-trio/trio/branch/master/graph/badge.svg

ci/travis.sh

@@ -88,10 +88,7 @@ else
     # Actual tests
     pip install -Ur test-requirements.txt
 
-    mkdir empty
-    cd empty
-
-    pytest -W error -ra -v --pyargs outcome --cov=outcome --cov-config=../.coveragerc --verbose
+    pytest -W error -ra -v tests --cov --cov-config=.coveragerc
 
     bash <(curl -s https://codecov.io/bash)
 fi

setup.py

@@ -9,7 +9,7 @@
 
 # read _version.py as bytes, otherwise exec will complain about
 # 'coding: utf-8', which we want there for the normal Python 2 import
-with open('outcome/_version.py', 'rb') as fp:
+with open('src/outcome/_version.py', 'rb') as fp:
     version_mod = fp.read()
 
 exec(version_mod, version)
@@ -26,7 +26,8 @@
     author='Frazer McLean',
     author_email='[email protected]',
     license='MIT -or- Apache License 2.0',
-    packages=find_packages(exclude=['tests']),
+    packages=find_packages('src'),
+    package_dir={'': 'src'},
     install_requires=['attrs'],
     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     keywords='result',