Merge pull request #834 from benjeffery/version_check

PEP 440 version check in CI

Author: mergify[bot]

.circleci/config.yml

@@ -43,7 +43,6 @@ jobs:
           command: |
             pre-commit run --all-files --show-diff-on-failure
 
-
       - run:
           name: Compile C with gcc
           command: |

appveyor.yml

@@ -25,11 +25,7 @@ build_script:
   - cmd: cd python
   - cmd: python setup.py build_ext --inplace
   # Install some modules needed for tests
-  - cmd: python -m pip install PyVCF
-  - cmd: python -m pip install newick
-  - cmd: python -m pip install python_jsonschema_objects
-  - cmd: python -m pip install xmlunittest
-  - cmd: python -m pip install portion
+  - cmd: python -m pip install -r requirements/appveyor-pypi.txt
   - cmd: python -m nose -vs --processes=%NUMBER_OF_PROCESSORS% --process-timeout=5000
 
 after_test:

python/requirements/appveyor-pypi.txt

@@ -0,0 +1,6 @@
+PyVCF
+newick
+python_jsonschema_objects
+xmlunittest
+portion
+packaging

python/requirements/development.txt

@@ -15,6 +15,7 @@ networkx
 newick
 nose
 numpy
+packaging
 portion
 pre-commit
 pyparsing 

python/tests/test_version.py

@@ -0,0 +1,38 @@
+# MIT License
+#
+# Copyright (c) 2020 Tskit Developers
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+"""
+Test python package versioning
+"""
+import unittest
+
+from packaging.version import Version
+
+from tskit import _version
+
+
+class TestPythonVersion(unittest.TestCase):
+    """
+    Test that the version is PEP440 compliant
+    """
+
+    def test_version(self):
+        self.assertEqual(str(Version(_version.tskit_version)), _version.tskit_version)

python/tskit/_version.py

@@ -1,4 +1,4 @@
 # Definitive location for the version number.
 # During development, should be x.y.z.devN
 # For beta should be x.y.zbN
-tskit_version = "0.3.1dev1"
+tskit_version = "0.3.1.dev1"