Merge 6fb4504 into 8055e82

Makefile

@@ -27,7 +27,7 @@ test_coverage: clean_coverage
 	(cd tests; PYTHONPATH=.. COVERAGE='coverage run -a --source ../scripts,olypy' ./test.sh)
 #	(cd sim; coverage run -a --source=..,. ./run-tests.py test-inputs/nothing.yml)
 	touch sim/.coverage
-	coverage combine .coverage tests/.coverage sim/.coverage
+	coverage combine -a tests/.coverage sim/.coverage
 	coverage report
 
 missing:

azure-pipelines.yml

@@ -0,0 +1,88 @@
+trigger:
+- master
+
+jobs:
+  - job: linux
+    timeoutInMinutes: 10  # does not cause a failure, unfortunately
+    pool:
+      vmImage: 'ubuntu-latest'
+    strategy:
+      matrix:
+        Python35:
+          python.version: '3.5'
+        Python36:
+          python.version: '3.6'
+        Python37:
+          python.version: '3.7'
+        Python38:
+          python.version: '3.8'
+        Python39:
+          python.version: '3.9'
+
+    steps:
+    - task: UsePythonVersion@0
+      inputs:
+        versionSpec: '$(python.version)'
+      displayName: 'Use Python $(python.version)'
+
+    - script: |
+        python -m pip install --upgrade pip
+        pip install . .[test]
+      displayName: 'Install dependencies'
+
+    - script: |
+        set -e
+        if [ ! -z "$(myenv)" ]; then
+          export $(myenv)
+        fi
+        make test_coverage
+      displayName: 'pytest'
+
+    - script: |
+        pip install coveralls
+        export CIRCLE_BRANCH=$BUILD_SOURCEBRANCH
+        coveralls
+      displayName: 'coveralls'
+      env:
+        CIRCLECI: 1
+        CIRCLE_BUILD_NUM: $(Build.BuildNumber)
+        COVERALLS_REPO_TOKEN: $(coveralls_repo_token)
+
+  - job: macos
+    timeoutInMinutes: 10  # does not cause a failure, unfortunately
+    pool:
+      vmImage: 'macOS-latest'
+    strategy:
+      matrix:
+        Python38:
+          python.version: '3.8'
+
+    steps:
+    - task: UsePythonVersion@0
+      inputs:
+        versionSpec: '$(python.version)'
+      displayName: 'Use Python $(python.version)'
+
+    - script: |
+        python -m pip install --upgrade pip
+        pip install . .[test]
+      displayName: 'Install dependencies'
+
+    - script: |
+        set -e
+        if [ ! -z "$(myenv)" ]; then
+          export $(myenv)
+        fi
+        make test_coverage
+        coverage report
+      displayName: 'pytest'
+
+    - script: |
+        pip install coveralls
+        export CIRCLE_BRANCH=$BUILD_SOURCEBRANCH
+        coveralls
+      displayName: 'coveralls'
+      env:
+        CIRCLECI: 1
+        CIRCLE_BUILD_NUM: $(Build.BuildNumber)
+        COVERALLS_REPO_TOKEN: $(coveralls_repo_token)

setup.py

@@ -1,38 +1,25 @@
 #!/usr/bin/env python
 
-import sys
 from os import path
 
 from setuptools import setup
-from setuptools.command.test import test as TestCommand
-
-
-class PyTest(TestCommand):
-    user_options = [('pytest-args=', 'a', "Arguments to pass into py.test")]
-
-    def initialize_options(self):
-        TestCommand.initialize_options(self)
-        self.pytest_args = []
-
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        import pytest
-
-        errno = pytest.main(self.pytest_args)
-        sys.exit(errno)
-
 
 packages = [
     'olypy',
     'olymap',
 ]
 
-requires = ['PyYAML', 'pngcanvas']
-test_requirements = ['pytest>=3.0.0', 'coverage', 'pytest-cov']
+requires = [
+    'PyYAML',
+    'pngcanvas',
+    'Jinja2',
+]
+
+test_requirements = ['pytest>=3.0.0', 'pytest-cov']
+
+extras_require = {
+    'test': test_requirements,  # setup no longer tests, so make them an extra
+}
 
 scripts = ['scripts/box-to-json',
            'scripts/build-player-lib',
@@ -60,6 +47,7 @@ def run_tests(self):
     url='https://github.com/olympiag3/olypy',
     packages=packages,
     python_requires=">=3.5.*",
+    extras_require=extras_require,
     include_package_data=True,
     setup_requires=['setuptools_scm'],
     install_requires=requires,
@@ -81,6 +69,4 @@ def run_tests(self):
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3 :: Only',
     ],
-    cmdclass={'test': PyTest},
-    tests_require=test_requirements,
 )