This commit is contained in:
Manuel Barkhau 2020-05-25 07:46:30 +00:00
parent 4d8395050f
commit ce21c3bcf9
13 changed files with 23 additions and 25 deletions

View file

@ -11,16 +11,16 @@ Provided subcommands: show, test, init, bump
""" """
import os import os
import sys import sys
import click
import logging
import typing as typ import typing as typ
import logging
import subprocess as sp import subprocess as sp
import click
from . import vcs from . import vcs
from . import config from . import config
from . import version
from . import rewrite from . import rewrite
from . import version
_VERBOSE = 0 _VERBOSE = 0

View file

@ -6,14 +6,14 @@
"""Parse setup.cfg or pycalver.cfg files.""" """Parse setup.cfg or pycalver.cfg files."""
import os import os
import typing as typ
import logging
import datetime as dt
import configparser
import six import six
import toml import toml
import configparser
import typing as typ
import pathlib2 as pl import pathlib2 as pl
import datetime as dt
import logging
from . import version from . import version

View file

@ -5,8 +5,8 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
"""Parse PyCalVer strings from files.""" """Parse PyCalVer strings from files."""
import logging
import typing as typ import typing as typ
import logging
from . import patterns from . import patterns

View file

@ -7,9 +7,10 @@
import io import io
import glob import glob
import typing as typ
import difflib import difflib
import logging import logging
import typing as typ
import pathlib2 as pl import pathlib2 as pl
from . import parse from . import parse
@ -17,7 +18,6 @@ from . import config
from . import version from . import version
from . import patterns from . import patterns
log = logging.getLogger("pycalver.rewrite") log = logging.getLogger("pycalver.rewrite")
@ -123,7 +123,7 @@ def rfd_from_content(
def _iter_file_paths( def _iter_file_paths(
file_patterns: config.PatternsByGlob file_patterns: config.PatternsByGlob,
) -> typ.Iterable[typ.Tuple[pl.Path, config.Patterns]]: ) -> typ.Iterable[typ.Tuple[pl.Path, config.Patterns]]:
for globstr, pattern_strs in file_patterns.items(): for globstr, pattern_strs in file_patterns.items():
file_paths = glob.glob(globstr) file_paths = glob.glob(globstr)

View file

@ -15,12 +15,11 @@ mercurial, then the git terms are used. For example "fetch"
""" """
import os import os
import typing as typ
import logging import logging
import tempfile import tempfile
import typing as typ
import subprocess as sp import subprocess as sp
log = logging.getLogger("pycalver.vcs") log = logging.getLogger("pycalver.vcs")

View file

@ -5,11 +5,12 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
"""Functions related to version string manipulation.""" """Functions related to version string manipulation."""
import logging
import pkg_resources
import typing as typ import typing as typ
import logging
import datetime as dt import datetime as dt
import pkg_resources
from . import lex_id from . import lex_id
from . import patterns from . import patterns

View file

@ -1,17 +1,15 @@
import os import os
import time import time
import shutil import shutil
import pathlib2 as pl
import subprocess as sp import subprocess as sp
import pytest import pytest
import pathlib2 as pl
from click.testing import CliRunner from click.testing import CliRunner
import pycalver.cli as cli
import pycalver.config as config import pycalver.config as config
import pycalver.patterns as patterns import pycalver.patterns as patterns
import pycalver.cli as cli
SETUP_CFG_FIXTURE = """ SETUP_CFG_FIXTURE = """
[metadata] [metadata]

View file

@ -4,7 +4,6 @@ from pycalver import config
from . import util from . import util
PYCALVER_TOML_FIXTURE_1 = """ PYCALVER_TOML_FIXTURE_1 = """
[pycalver] [pycalver]
current_version = "v201808.0123-alpha" current_version = "v201808.0123-alpha"

View file

@ -1,4 +1,5 @@
import random import random
from pycalver import lex_id from pycalver import lex_id

View file

@ -1,6 +1,5 @@
from pycalver import parse from pycalver import parse
SETUP_PY_FIXTURE = """ SETUP_PY_FIXTURE = """
# setup.py # setup.py
import setuptools import setuptools

View file

@ -1,4 +1,5 @@
import re import re
import pytest import pytest
from pycalver import patterns from pycalver import patterns

View file

@ -6,7 +6,6 @@ from pycalver import version
from . import util from . import util
REWRITE_FIXTURE = """ REWRITE_FIXTURE = """
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
__version__ = "v201809.0002-beta" __version__ = "v201809.0002-beta"

View file

@ -2,9 +2,10 @@ import os
import shlex import shlex
import shutil import shutil
import tempfile import tempfile
import pathlib2 as pl
import subprocess as sp import subprocess as sp
import pathlib2 as pl
class Shell: class Shell:
def __init__(self, cwd): def __init__(self, cwd):