Merge pull request #18 from dephell/fix-packaging

Support packaging 22.0

Author: orsinium

.gitignore

@@ -12,3 +12,5 @@ pip-wheel-metadata/
 
 setup.py
 README.rst
+/.venvs/
+/.task/

.travis.yml

@@ -0,0 +1,117 @@
+# https://taskfile.dev/
+version: "3"
+
+vars:
+  PYTHON: python3
+  VENVS: .venvs
+  TEST_ENV: .venvs/test
+  LINT_ENV: .venvs/lint
+  DOCS_ENV: .venvs/docs
+  TEST_PYTHON: "{{.TEST_ENV}}/bin/python3"
+  LINT_PYTHON: "{{.LINT_ENV}}/bin/python3"
+
+env:
+  FLIT_ROOT_INSTALL: "1"
+
+tasks:
+  install:flit:
+    status:
+      - which flit
+    cmds:
+      - python3 -m pip install flit
+  venv:test:
+    status:
+      - test -d {{.TEST_ENV}}
+    cmds:
+      - "{{.PYTHON}} -m venv {{.TEST_ENV}}"
+  venv:lint:
+    status:
+      - test -d {{.LINT_ENV}}
+    cmds:
+      - "{{.PYTHON}} -m venv {{.LINT_ENV}}"
+  install:test:
+    sources:
+      - pyproject.toml
+    deps:
+      - install:flit
+      - venv:test
+    cmds:
+      - >
+        flit install
+        --python {{.TEST_PYTHON}}
+        --extras=test,integrations
+        --deps=production
+        --symlink
+  install:lint:
+    sources:
+      - pyproject.toml
+    deps:
+      - install:flit
+      - venv:lint
+    cmds:
+      - >
+        flit install
+        --python {{.LINT_PYTHON}}
+        --extras=lint,integrations
+        --deps=production
+        --symlink
+
+  pytest:
+    desc: "run Python tests"
+    deps:
+      - install:test
+    cmds:
+      - "{{.TEST_PYTHON}} -m pytest {{.CLI_ARGS}}"
+  flake8:
+    desc: "lint Python code"
+    deps:
+      - install:lint
+    cmds:
+      - "{{.LINT_PYTHON}} -m flake8 {{.CLI_ARGS}} ."
+  mypy:
+    desc: "check type annotations"
+    deps:
+      - install:lint
+    cmds:
+      - "{{.LINT_PYTHON}} -m mypy {{.CLI_ARGS}}"
+  unify:
+    desc: "convert double quotes to single ones"
+    deps:
+      - install:lint
+    cmds:
+      - "{{.LINT_PYTHON}} -m unify -r -i --quote=\\' {{.CLI_ARGS}} dephell_specifier tests"
+  isort:
+    desc: "sort imports"
+    deps:
+      - install:lint
+    cmds:
+      - "{{.LINT_PYTHON}} -m isort {{.CLI_ARGS}} ."
+  isort:check:
+    desc: "sort imports"
+    deps:
+      - install:lint
+    cmds:
+      - "{{.LINT_PYTHON}} -m isort --check {{.CLI_ARGS}} ."
+
+  # groups
+  format:
+    desc: "run all code formatters"
+    cmds:
+      - task: isort
+      - task: unify
+  lint:
+    desc: "run all linters"
+    cmds:
+      - task: flake8
+      - task: mypy
+      - task: isort:check
+  test:
+    desc: "run all tests"
+    cmds:
+      - task: pytest
+  all:
+    desc: "run all code formatters, linters, and tests"
+    cmds:
+      - task: format
+      - task: lint
+      - task: test

Taskfile.yml

@@ -1,6 +1,13 @@
+"""A package to work with version specifiers.
+
+Supports PEP-440, SemVer, Ruby, NPM, and Maven specifier formats.
+"""
+from __future__ import annotations
+
 from .git_specifier import GitSpecifier
 from .range_specifier import RangeSpecifier
 from .specifier import Specifier
 
 
+__version__ = '0.2.2'
 __all__ = ['GitSpecifier', 'RangeSpecifier', 'Specifier']

dephell_specifier/__init__.py

@@ -1,4 +1,5 @@
-# built-in
+from __future__ import annotations
+
 from enum import Enum, unique
 
 

dephell_specifier/constants.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 
 class GitSpecifier:
-    def __contains__(self, release):
+    def __contains__(self, release: object) -> bool:
         # check that this is GitRelease without imports
         return hasattr(release, 'commit')
 

dephell_specifier/git_specifier.py

@@ -1,12 +1,12 @@
+from __future__ import annotations
+
 import re
-from typing import Set, List
+from typing import Iterable
 
-# external
 from packaging.specifiers import InvalidSpecifier
-from packaging.version import LegacyVersion, parse, Version
+from packaging.version import Version, parse
 
-# app
-from .constants import PYTHONS, JoinTypes, OPERATOR_SYMBOLS
+from .constants import OPERATOR_SYMBOLS, PYTHONS, JoinTypes
 from .git_specifier import GitSpecifier
 from .specifier import Specifier
 
@@ -16,8 +16,10 @@
 
 
 class RangeSpecifier:
+    _specs: set
+    join_type: JoinTypes
 
-    def __init__(self, spec=None):
+    def __init__(self, spec: object | None = None) -> None:
         if not spec:
             self._specs = set()
             self.join_type = JoinTypes.AND
@@ -42,7 +44,7 @@ def __init__(self, spec=None):
         return
 
     @classmethod
-    def _parse(cls, spec) -> Set[Specifier]:
+    def _parse(cls, spec: object) -> set[Specifier]:
         spec = cls._split_specifier(spec)
         result = set()
         for constr in spec:
@@ -74,7 +76,7 @@ def _parse(cls, spec) -> Set[Specifier]:
         return result
 
     @staticmethod
-    def _split_specifier(spec) -> List[str]:
+    def _split_specifier(spec: object) -> list[str]:
         if isinstance(spec, (list, tuple)):
             return list(spec)
         spec = str(spec)
@@ -120,11 +122,11 @@ def _parse_star_and_operator(constr: str) -> Specifier:
             return Specifier(constr.replace('.*', '.0'))
 
         version = parse(constr.lstrip(OPERATOR_SYMBOLS).rstrip('.*'))
-        parts = version.release[:-1] + (version.release[-1] + 1, )  # type: ignore
+        parts = version.release[:-1] + (version.release[-1] + 1, )
         return Specifier(constr[:2] + '.'.join(map(str, parts)))
 
     @staticmethod
-    def _parse_maven(constr: str) -> Set[Specifier]:
+    def _parse_maven(constr: str) -> set[Specifier]:
         if constr in '[]()':
             return set()
         if constr[0] == '[' and constr[-1] == ']':
@@ -140,10 +142,8 @@ def _parse_maven(constr: str) -> Set[Specifier]:
         raise ValueError('non maven constraint: {}'.format(constr))
 
     @staticmethod
-    def _parse_npm(constr: str) -> Set[Specifier]:
+    def _parse_npm(constr: str) -> set[Specifier]:
         version = parse(constr.lstrip(OPERATOR_SYMBOLS).replace('.*', '.0'))
-        if isinstance(version, LegacyVersion):
-            raise InvalidSpecifier(constr)
         parts = version.release + (0, 0)
         parts = tuple(map(str, parts))
 
@@ -171,7 +171,7 @@ def _parse_npm(constr: str) -> Set[Specifier]:
             left += '.' + ''.join(map(str, version.pre))
         return {Specifier('>=' + left), Specifier('==' + right)}
 
-    def attach_time(self, releases) -> bool:
+    def attach_time(self, releases: Iterable) -> bool:
         """Attach time to all specifiers if possible
         """
         ok = False
@@ -191,13 +191,13 @@ def to_marker(self, name: str, *, wrap: bool = False) -> str:
             marker = '(' + marker + ')'
         return marker
 
-    def copy(self) -> 'RangeSpecifier':
+    def copy(self) -> RangeSpecifier:
         new = type(self)()
         new._specs = self._specs.copy()
         new.join_type = self.join_type
         return new
 
-    def peppify(self) -> 'RangeSpecifier':
+    def peppify(self) -> RangeSpecifier:
         """Returns python specifier without `||`
         """
         if self.join_type == JoinTypes.AND:
@@ -220,7 +220,7 @@ def peppify(self) -> 'RangeSpecifier':
             elif left is None or python > left:
                 excluded.append(python)
         if right is not None:
-            right = (pythons + [None])[pythons.index(right) + 1]  # type: ignore
+            right = (pythons + [None])[pythons.index(right) + 1]
 
         # get excluded intervals
         if right is not None:
@@ -249,27 +249,27 @@ def python_compat(self) -> bool:
 
     # magic methods
 
-    def __add__(self, other):
+    def __add__(self, other: object) -> RangeSpecifier:
         new = self.copy()
         attached = new._attach(other)
         if attached:
             return new
         return NotImplemented
 
-    def __radd__(self, other):
+    def __radd__(self, other: object) -> RangeSpecifier:
         new = self.copy()
         attached = new._attach(other)
         if attached:
             return new
         return NotImplemented
 
-    def __iadd__(self, other):
+    def __iadd__(self, other: object) -> RangeSpecifier:
         attached = self._attach(other)
         if attached:
             return self
         return NotImplemented
 
-    def _attach(self, other) -> bool:
+    def _attach(self, other: object) -> bool:
         if isinstance(other, GitSpecifier):
             self._specs.add(other)
             return True
@@ -318,34 +318,34 @@ def _attach(self, other) -> bool:
         self._specs = new_specs
         return True
 
-    def __contains__(self, release) -> bool:
+    def __contains__(self, release: object) -> bool:
         rule = all if self.join_type == JoinTypes.AND else any
         return rule((release in specifier) for specifier in self._specs)
 
-    def __str__(self):
+    def __str__(self) -> str:
         if not self._specs:
             return ''
         sep = ',' if self.join_type == JoinTypes.AND else ' || '
         return sep.join(sorted(map(str, self._specs)))
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return '{name}({spec})'.format(
             name=self.__class__.__name__,
             spec=str(self),
         )
 
-    def __bool__(self):
+    def __bool__(self) -> bool:
         return bool(self._specs)
 
-    def __lt__(self, other):
+    def __lt__(self, other: object) -> bool:
         if not isinstance(other, type(self)):
             return False
         return str(self) < str(other)
 
-    def __eq__(self, other):
+    def __eq__(self, other: object) -> bool:
         if not isinstance(other, type(self)):
             return False
         return str(self) == str(other)
 
-    def __hash__(self):
+    def __hash__(self) -> int:
         return hash(str(self))