introduce travis jobs and configure egg builds them (#288)v3.0.3

3 files changed, 78 insertions, 31 deletions

diff --git a/.travis.yml b/.travis.yml
index bd28261..665767b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,48 +1,92 @@
 language: python
 sudo: false
+
+stages:
+- linting
+- test
+- deploy
+
+
+credentials:
+  - &pypi
+    provider: pypi
+    user: ronny
+    password:
+      secure: QGJhDXmfFDKysMJJV/ONGaHHzG/aImhU3DdhEP63d657iQSn/Cb4EG/l9YmVnRzpJ94nSDXZB8YwptR7rid0bOtidb32lxN8n6UiWILCXWeAN2FE+tT9/0xIct4HUJZ8OttD1gft/Di722Gy+s9PzFwjwrV4efkxCzgjfYOjkMeq3aO6NoG3ur0iZXJh7ODwLp4sRFep2NpIEaXm2qMdnnXpck6bJ1q/NtvPx9CAZivd9HYa0evg5j1ENTz1mXXafhgF+0vRCBXA33xJuysO6CKtk+2mizL1QHfosOERiKl9+zPyZw+VvSchbCVwgxrMSiRcpGag+4SegyHrj1M/2YqfFzMF/yuFGcqXl2VkEqlnBQOVMNW3Kdcmnm+caNbddnv+M384WFz4nV8nWjcsD5l27+XlMWfuvskDIvZKtVCXmmbtqgwM4tqoYd6uxbnooRfwINTGx8sNzKP10xkaesB3ZBCEpecOKA1AXUAZ74RfYWWExv6eIuVGwyIJmOcD8M/17N8g58GxxO+88gx50EuhyNiRjYZDUipfVydfJwBwpD+p695NixUMITuksucQftjHsQp+laGWJlDIPvFwI85wDJUYAyrzn6L1W+smkm1bGomuliW2MJfxeSZAmSk4CE5VOpIWQTBmDLR3pxBhcaqzwdd4mAWvMi/fpM4yJJI=
+
 python:
 - '2.7'
 - '3.4'
 - '3.5'
 - '3.6'
-#- '3.7'
 env:
 - TOXENV=py-test
 
-matrix:
+jobs:
   include:
-    - python: '3.5'
-      env: TOXENV=flake8
-    - python: '3.5'
+    - stage: linting
+      name: check readme
+      python: '3.6'
       env: TOXENV=check_readme
-    - python: '2.7'
+    # - stage: test
+    #   python: '3.7'
+    #   dist: xenial
+    - stage: test
+      python: '2.7'
       env: SELFINSTALL=1
-    - python: '3.5'
+    - stage: test
+      python: '3.6'
       env: SELFINSTALL=1
-cache:
-  files:
-  - $HOME/.pip/cache
-  - $Home/.cache/pip
-install: pip install tox
-script:
-- python testing/runtests_travis.py
 
+    - stage: linting
+      python: '3.6'
+      name: validate pre-commit
+      env:
+      install:
+      - pip install pre-commit
+      - pre-commit install-hooks
+      script:
+      - pre-commit run --all-files
 
+    - &deploy
+      stage: deploy
+      name: "modern distributions"
+      python: '3.6'
+      install:
+      - pip install -U pip setuptools wheel
+      script: skip
+      deploy:
+        <<: *pypi
+        on:
+          tags: true
+      distributions: "sdist bdist_wheel"
 
-credentials:
-  - &pypi
-    provider: pypi
-    user: ronny
-    password:
-      secure: QGJhDXmfFDKysMJJV/ONGaHHzG/aImhU3DdhEP63d657iQSn/Cb4EG/l9YmVnRzpJ94nSDXZB8YwptR7rid0bOtidb32lxN8n6UiWILCXWeAN2FE+tT9/0xIct4HUJZ8OttD1gft/Di722Gy+s9PzFwjwrV4efkxCzgjfYOjkMeq3aO6NoG3ur0iZXJh7ODwLp4sRFep2NpIEaXm2qMdnnXpck6bJ1q/NtvPx9CAZivd9HYa0evg5j1ENTz1mXXafhgF+0vRCBXA33xJuysO6CKtk+2mizL1QHfosOERiKl9+zPyZw+VvSchbCVwgxrMSiRcpGag+4SegyHrj1M/2YqfFzMF/yuFGcqXl2VkEqlnBQOVMNW3Kdcmnm+caNbddnv+M384WFz4nV8nWjcsD5l27+XlMWfuvskDIvZKtVCXmmbtqgwM4tqoYd6uxbnooRfwINTGx8sNzKP10xkaesB3ZBCEpecOKA1AXUAZ74RfYWWExv6eIuVGwyIJmOcD8M/17N8g58GxxO+88gx50EuhyNiRjYZDUipfVydfJwBwpD+p695NixUMITuksucQftjHsQp+laGWJlDIPvFwI85wDJUYAyrzn6L1W+smkm1bGomuliW2MJfxeSZAmSk4CE5VOpIWQTBmDLR3pxBhcaqzwdd4mAWvMi/fpM4yJJI=
-
-deploy:
-  - <<: *pypi
-    on:
-      tags: true
+    - &eggs
+      <<: *deploy
+      name: "python eggs 2.7"
       python: '2.7'
-    distributions: "sdist bdist_wheel"
-  - <<: *pypi
-    on:
-      tags: true
-    distributions: "bdist_egg"
+      distributions: "bdist_egg"
+    - <<: *eggs
+      name: "python eggs 3.4"
+      python: '3.4'
+
+    - <<: *eggs
+      name: "python eggs 3.5"
+      python: '3.5'
+
+    - <<: *eggs
+      name: "python eggs 3.6"
+      python: '3.6'
+
+    # - <<: *eggs
+    #   name: "python eggs 3.7"
+    #   python: '3.7'
+
+cache:
+  directories:
+  - $HOME/.cache/pip
+  - $HOME/.cache/pre-commit
+
+install: pip install tox
+script:
+- python testing/runtests_travis.py
diff --git a/src/setuptools_scm/hg.py b/src/setuptools_scm/hg.py
index b76f2d9..d8f43ab 100644
--- a/src/setuptools_scm/hg.py
+++ b/src/setuptools_scm/hg.py
@@ -57,7 +57,9 @@ def parse(root, config=None):
         if tag == "null":
             tag = "0.0"
             dist = int(dist) + 1
-        return _hg_tagdist_normalize_tagcommit(config.absolute_root, tag, dist, node, branch)
+        return _hg_tagdist_normalize_tagcommit(
+            config.absolute_root, tag, dist, node, branch
+        )
     except ValueError:
         pass  # unpacking failed, old hg
 
diff --git a/src/setuptools_scm/version.py b/src/setuptools_scm/version.py
index b2ad2f7..ea414f6 100644
--- a/src/setuptools_scm/version.py
+++ b/src/setuptools_scm/version.py
@@ -103,6 +103,7 @@ def tag_to_version(tag, config=None):
     if VERSION_CLASS is not None:
         version = pkg_parse_version(version)
         trace("version", repr(version))
+
     return version