Merge 1c709b5 into e0c4f02

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 3.0 (unreleased)
+
+- Removed `versions` in favor of `version` option.
+- Removed `|` in favor of `||` for checking multiple versions.
+
 # 2.0.1 (2019-10-13)
 
 - Restore compatibility layer to unofficially support legacy Python.

Makefile

@@ -45,7 +45,7 @@ DEPENDENCIES := $(VIRTUAL_ENV)/.poetry-$(shell bin/checksum pyproject.toml poetr
 install: $(DEPENDENCIES) .cache
 
 $(DEPENDENCIES): poetry.lock
-	@ poetry config settings.virtualenvs.in-project true || poetry config virtualenvs.in-project true
+	@ poetry config virtualenvs.in-project true || poetry config settings.virtualenvs.in-project true
 	poetry install
 	@ touch $@
 

examples/verchew.ini

@@ -6,7 +6,7 @@ version = 1.2
 [Newer Working Program]
 
 cli = working-program
-versions =  4.1 | 4.2
+version =  4.1 || 4.2
 message = Version 4.x is required to get the special features.
 
 [Broken Program]

pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 
 name = "verchew"
-version = "2.0.1"  # also update verchew/script.py
+version = "3.0b1"  # also update verchew/script.py
 description = "System dependency version checker."
 
 license = "MIT"

tests/test_cli.py

@@ -131,7 +131,7 @@ def it_displays_help_information(cli):
     def it_displays_version_information(cli):
         cmd = cli('--version')
 
-        expect(cmd.stdout or cmd.stderr).contains("verchew v2.")
+        expect(cmd.stdout).startswith("verchew v")
         expect(cmd.returncode) == 0
 
 

verchew/script.py

@@ -34,7 +34,6 @@
 import os
 import re
 import sys
-import warnings
 from collections import OrderedDict
 from subprocess import PIPE, STDOUT, Popen
 from typing import Any, Dict
@@ -47,7 +46,7 @@
 else:
     import configparser  # type: ignore
 
-__version__ = '2.0.1'
+__version__ = '3.0b1'
 
 CONFIG_FILENAMES = ['verchew.ini', '.verchew.ini', '.verchewrc', '.verchew']
 
@@ -197,21 +196,7 @@ def parse_config(path):
             data[section][name] = value
 
     for name in data:
-        if 'versions' in data[name]:
-            warnings.warn(
-                "'versions' is deprecated, use 'version' instead", DeprecationWarning
-            )
-            version = data[name].pop('versions') or ""
-        else:
-            version = data[name].get('version') or ""
-
-        if ' | ' in version:
-            warnings.warn(
-                "'|' is deprecated, use '||' to separate multiple versions",
-                DeprecationWarning,
-            )
-            version = version.replace(' | ', ' || ')
-
+        version = data[name].get('version') or ""
         data[name]['version'] = version
         data[name]['patterns'] = [v.strip() for v in version.split('||')]
 

verchew/tests/test_script.py

@@ -92,40 +92,6 @@ def with_multiple_versions(config):
             'Foobar': {'version': '2 || 3 ||     4', 'patterns': ['2', '3', '4']}
         }
 
-    def with_legacy_versions_option(config):
-        write(
-            config,
-            """
-        [Foobar]
-
-        cli = foobar
-        versions = v1.2.3
-        """,
-        )
-
-        expect(parse_config(str(config))) == {
-            'Foobar': {'cli': 'foobar', 'version': 'v1.2.3', 'patterns': ['v1.2.3']}
-        }
-
-    def with_legacy_versions_separator(config):
-        write(
-            config,
-            """
-        [Foobar]
-
-        cli = foobar
-        version = v1.2.3 | v1.2.4
-        """,
-        )
-
-        expect(parse_config(str(config))) == {
-            'Foobar': {
-                'cli': 'foobar',
-                'version': 'v1.2.3 || v1.2.4',
-                'patterns': ['v1.2.3', 'v1.2.4'],
-            }
-        }
-
 
 def describe_get_version():
     def when_missing():