Merge pull request #306 from atomicateam/develop

Azure pipeline config, increment version

.travis.yml

@@ -4,6 +4,10 @@ language: python
 python:
 - '3.6'
 - '3.7'
+branches:
+  only:
+  - master
+
 install: pip install tox-travis
 script: tox
 stages:

atomica/version.py

@@ -6,7 +6,7 @@
 
 import sciris as sc
 
-version = "1.0.25"
-versiondate = "2019-02-16"
+version = "1.0.26"
+versiondate = "2019-03-11"
 gitinfo = sc.gitinfo(__file__, verbose=False)
 

azure-pipelines.yml

@@ -0,0 +1,45 @@
+jobs:
+
+- job: 'tox'
+
+  pool:
+    vmImage: 'ubuntu-16.04'
+  strategy:
+    matrix:
+      Python36:
+        python.version: '3.6'
+        TOXENV: 'py36'
+      Python37:
+        python.version: '3.7'
+        TOXENV: 'py37'
+
+  steps:
+  - task: UsePythonVersion@0
+    displayName: 'Use Python $(python.version)'
+    inputs:
+      versionSpec: '$(python.version)'
+
+  - script: python -m pip install --upgrade pip && python -m pip install tox
+    displayName: 'Install Tox'
+
+  - script: tox -e $(TOXENV)
+    displayName: 'Run Tox'
+
+  - task: PublishTestResults@2
+    inputs:
+      testResultsFiles: '**/test-*.xml'
+      testRunTitle: 'Python $(python.version)'
+    condition: succeededOrFailed()
+
+# TODO - Switch deployment over to Azure DevOps
+
+#- job: 'deploy'
+#  dependsOn: 'tox'
+#  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+#
+#  steps:
+#  - script: python setup.py build && python setup.py sdist
+#    displayName: 'Build distribution'
+#
+#  - script: twine -upload -u $(pypi.username) -p $(pypi.password) dist/*
+#    displayName: 'Upload using Twine'

tox.ini

@@ -11,15 +11,8 @@ deps = -rrequirements.txt
 commands =
     pytest --nbsmoke-run {toxinidir} {posargs}
 
-;[testenv:docs]
-;description = Use sphinx-build to build the HTML docs
-;deps = sphinx
-;    nbsphinx
-;    -rrequirements.txt
-;commands = sphinx-build "{toxinidir}/docs" "{toxinidir}/docs/_build"
-
 [pytest]
-addopts = -ra -v -n 2
+addopts = -ra -v -n 2 --junitxml=junit/test-results.xml
 nbsmoke_cell_timeout = 600
 console_output_style = count
 testpaths = tests docs/examples