Hello community,
here is the log from the commit of package python-setuptools_scm for
openSUSE:Factory checked in at 2019-05-17 23:39:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-setuptools_scm (Old)
and /work/SRC/openSUSE:Factory/.python-setuptools_scm.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-setuptools_scm"
Fri May 17 23:39:00 2019 rev:23 rq:702875 version:3.3.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-setuptools_scm/python-setuptools_scm.changes
2019-04-19 18:36:38.535052050 +0200
+++
/work/SRC/openSUSE:Factory/.python-setuptools_scm.new.5148/python-setuptools_scm.changes
2019-05-17 23:39:02.502048646 +0200
@@ -1,0 +2,9 @@
+Tue May 14 11:26:42 UTC 2019 - Marketa Calabkova <[email protected]>
+
+- update to 3.3.3
+ * adding the fallback_version option, which sets the version to
+ be used when everything else fails.
+ * use a specific fallback root when calling fallbacks.
+ * fix python3.8 support and add builds for up to python3.8
+
+-------------------------------------------------------------------
Old:
----
setuptools_scm-3.2.0.tar.gz
New:
----
setuptools_scm-3.3.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-setuptools_scm.spec ++++++
--- /var/tmp/diff_new_pack.WsKydK/_old 2019-05-17 23:39:03.066048336 +0200
+++ /var/tmp/diff_new_pack.WsKydK/_new 2019-05-17 23:39:03.070048334 +0200
@@ -29,7 +29,7 @@
%else
Name: python-setuptools_scm
%endif
-Version: 3.2.0
+Version: 3.3.3
Release: 0
Summary: Python setuptools handler for SCM tags
License: MIT
++++++ add-rpmfail-pytest-markers.patch ++++++
--- /var/tmp/diff_new_pack.WsKydK/_old 2019-05-17 23:39:03.098048318 +0200
+++ /var/tmp/diff_new_pack.WsKydK/_new 2019-05-17 23:39:03.102048316 +0200
@@ -1,19 +1,19 @@
-Index: setuptools_scm-3.2.0/testing/test_regressions.py
+Index: setuptools_scm-3.3.3/testing/test_regressions.py
===================================================================
---- setuptools_scm-3.2.0.orig/testing/test_regressions.py
-+++ setuptools_scm-3.2.0/testing/test_regressions.py
+--- setuptools_scm-3.3.3.orig/testing/test_regressions.py
++++ setuptools_scm-3.3.3/testing/test_regressions.py
@@ -49,6 +49,7 @@ def test_pip_egg_info(tmpdir, monkeypatc
- assert get_version(root=p.strpath) == "1.0"
+ assert get_version(root=p.strpath, fallback_root=p.strpath) == "1.0"
[email protected]_github_connect
@pytest.mark.issue(164)
def test_pip_download(tmpdir, monkeypatch):
monkeypatch.chdir(tmpdir)
-Index: setuptools_scm-3.2.0/testing/test_setuptools_support.py
+Index: setuptools_scm-3.3.3/testing/test_setuptools_support.py
===================================================================
---- setuptools_scm-3.2.0.orig/testing/test_setuptools_support.py
-+++ setuptools_scm-3.2.0/testing/test_setuptools_support.py
+--- setuptools_scm-3.3.3.orig/testing/test_setuptools_support.py
++++ setuptools_scm-3.3.3/testing/test_setuptools_support.py
@@ -65,12 +65,14 @@ def check(packagedir, expected_version,
)
++++++ setuptools_scm-3.2.0.tar.gz -> setuptools_scm-3.3.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-3.2.0/CHANGELOG.rst
new/setuptools_scm-3.3.3/CHANGELOG.rst
--- old/setuptools_scm-3.2.0/CHANGELOG.rst 2019-01-16 20:34:04.000000000
+0100
+++ new/setuptools_scm-3.3.3/CHANGELOG.rst 2019-05-12 11:31:03.000000000
+0200
@@ -1,3 +1,25 @@
+v3.3.3
+======
+
+* add eggs for python3.7 and 3.8 to the deploy
+
+v3.3.2
+======
+
+
+* fix #335 - fix python3.8 support and add builds for up to python3.8
+
+v3.3.1
+======
+
+* fix #333 (regression from #198) - use a specific fallback root when calling
fallbacks. Remove old
+ hack that resets the root when fallback entrypoints are present.
+
+v3.3.0
+======
+
+* fix #198 by adding the ``fallback_version`` option, which sets the version
to be used when everything else fails.
+
v3.2.0
======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-3.2.0/PKG-INFO
new/setuptools_scm-3.3.3/PKG-INFO
--- old/setuptools_scm-3.2.0/PKG-INFO 2019-01-16 20:34:32.000000000 +0100
+++ new/setuptools_scm-3.3.3/PKG-INFO 2019-05-12 11:31:28.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: setuptools_scm
-Version: 3.2.0
+Version: 3.3.3
Summary: the blessed package to manage your versions by scm tags
Home-page: https://github.com/pypa/setuptools_scm/
Author: Ronny Pfannschmidt
@@ -107,8 +107,8 @@
.. important::
- Ensure neither the ``[metadata] version`` option nor the
``[egg_info]``
- section are not defined, as these will interfere with
``setuptools_scm``.
+ Ensure neither the ``[metadata]`` ``version`` option nor the
``[egg_info]``
+ section are defined, as these will interfere with
``setuptools_scm``.
You may also need to define a ``pyproject.toml`` file (`PEP-0518
<https://www.python.org/dev/peps/pep-0518>`_) to ensure you have the
required
@@ -261,12 +261,6 @@
repository to point ``setuptools_scm`` at the root of the
repository by
supplying ``__file__``.
- :parse:
- A function that will be used instead of the discovered SCM for
parsing the
- version.
- Use with caution, this is a function for advanced use, and you
should be
- familiar with the ``setuptools_scm`` internals to use it.
-
:tag_regex:
A Python regex string to extract the version part from any SCM tag.
The regex needs to contain three named groups prefix, version and
suffix,
@@ -275,6 +269,18 @@
Defaults to the value of
``setuptools_scm.config.DEFAULT_TAG_REGEX``
(see `config.py <src/setuptools_scm/config.py>`_).
+ :fallback_version:
+ A version string that will be used if no other method for
detecting the
+ version worked (e.g., when using a tarball with no metadata). If
this is
+ unset (the default), setuptools_scm will error if it fails to
detect the
+ version.
+
+ :parse:
+ A function that will be used instead of the discovered SCM for
parsing the
+ version.
+ Use with caution, this is a function for advanced use, and you
should be
+ familiar with the ``setuptools_scm`` internals to use it.
+
:git_describe_command:
This command will be used instead the default ``git describe``
command.
Use with caution, this is a function for advanced use, and you
should be
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-3.2.0/README.rst
new/setuptools_scm-3.3.3/README.rst
--- old/setuptools_scm-3.2.0/README.rst 2019-01-16 20:34:04.000000000 +0100
+++ new/setuptools_scm-3.3.3/README.rst 2019-05-12 11:31:03.000000000 +0200
@@ -99,8 +99,8 @@
.. important::
- Ensure neither the ``[metadata] version`` option nor the ``[egg_info]``
- section are not defined, as these will interfere with ``setuptools_scm``.
+ Ensure neither the ``[metadata]`` ``version`` option nor the ``[egg_info]``
+ section are defined, as these will interfere with ``setuptools_scm``.
You may also need to define a ``pyproject.toml`` file (`PEP-0518
<https://www.python.org/dev/peps/pep-0518>`_) to ensure you have the required
@@ -253,12 +253,6 @@
repository to point ``setuptools_scm`` at the root of the repository by
supplying ``__file__``.
-:parse:
- A function that will be used instead of the discovered SCM for parsing the
- version.
- Use with caution, this is a function for advanced use, and you should be
- familiar with the ``setuptools_scm`` internals to use it.
-
:tag_regex:
A Python regex string to extract the version part from any SCM tag.
The regex needs to contain three named groups prefix, version and suffix,
@@ -267,6 +261,18 @@
Defaults to the value of ``setuptools_scm.config.DEFAULT_TAG_REGEX``
(see `config.py <src/setuptools_scm/config.py>`_).
+:fallback_version:
+ A version string that will be used if no other method for detecting the
+ version worked (e.g., when using a tarball with no metadata). If this is
+ unset (the default), setuptools_scm will error if it fails to detect the
+ version.
+
+:parse:
+ A function that will be used instead of the discovered SCM for parsing the
+ version.
+ Use with caution, this is a function for advanced use, and you should be
+ familiar with the ``setuptools_scm`` internals to use it.
+
:git_describe_command:
This command will be used instead the default ``git describe`` command.
Use with caution, this is a function for advanced use, and you should be
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-3.2.0/setup.py
new/setuptools_scm-3.3.3/setup.py
--- old/setuptools_scm-3.2.0/setup.py 2019-01-16 20:34:04.000000000 +0100
+++ new/setuptools_scm-3.3.3/setup.py 2019-05-12 11:31:03.000000000 +0200
@@ -76,6 +76,7 @@
.hg_archival.txt = setuptools_scm.hg:parse_archival
PKG-INFO = setuptools_scm.hacks:parse_pkginfo
pip-egg-info = setuptools_scm.hacks:parse_pip_egg_info
+ setup.py = setuptools_scm.hacks:fallback_version
[setuptools_scm.files_command]
.hg = setuptools_scm.file_finder_hg:hg_find_files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-3.2.0/src/setuptools_scm/__init__.py
new/setuptools_scm-3.3.3/src/setuptools_scm/__init__.py
--- old/setuptools_scm-3.2.0/src/setuptools_scm/__init__.py 2019-01-16
20:34:04.000000000 +0100
+++ new/setuptools_scm-3.3.3/src/setuptools_scm/__init__.py 2019-05-12
11:31:03.000000000 +0200
@@ -31,12 +31,12 @@
config = Configuration()
config.root = root
# TODO: Is it API?
- return _version_from_entrypoint(config, "setuptools_scm.parse_scm")
+ return _version_from_entrypoints(config)
-def _call_entrypoint_fn(config, fn):
+def _call_entrypoint_fn(root, config, fn):
if function_has_arg(fn, "config"):
- return fn(config.absolute_root, config=config)
+ return fn(root, config=config)
else:
warnings.warn(
"parse functions are required to provide a named argument"
@@ -44,12 +44,18 @@
category=PendingDeprecationWarning,
stacklevel=2,
)
- return fn(config.absolute_root)
+ return fn(root)
-def _version_from_entrypoint(config, entrypoint):
- for ep in iter_matching_entrypoints(config.absolute_root, entrypoint):
- version = _call_entrypoint_fn(config, ep.load())
+def _version_from_entrypoints(config, fallback=False):
+ if fallback:
+ entrypoint = "setuptools_scm.parse_scm_fallback"
+ root = config.fallback_root
+ else:
+ entrypoint = "setuptools_scm.parse_scm"
+ root = config.absolute_root
+ for ep in iter_matching_entrypoints(root, entrypoint):
+ version = _call_entrypoint_fn(root, config, ep.load())
if version:
return version
@@ -81,20 +87,16 @@
return meta(tag=pretended, preformatted=True, config=config)
if config.parse:
- parse_result = _call_entrypoint_fn(config, config.parse)
+ parse_result = _call_entrypoint_fn(config.absolute_root, config,
config.parse)
if isinstance(parse_result, string_types):
raise TypeError(
"version parse result was a string\nplease return a parsed
version"
)
- version = parse_result or _version_from_entrypoint(
- config, "setuptools_scm.parse_scm_fallback"
- )
+ version = parse_result or _version_from_entrypoints(config,
fallback=True)
else:
# include fallbacks after dropping them from the main entrypoint
- version = _version_from_entrypoint(
- config, "setuptools_scm.parse_scm"
- ) or _version_from_entrypoint(
- config, "setuptools_scm.parse_scm_fallback"
+ version = _version_from_entrypoints(config) or
_version_from_entrypoints(
+ config, fallback=True
)
if version:
@@ -120,6 +122,8 @@
write_to_template=None,
relative_to=None,
tag_regex=None,
+ fallback_version=None,
+ fallback_root=".",
parse=None,
git_describe_command=None,
):
@@ -132,12 +136,14 @@
config = Configuration()
config.root = root
+ config.fallback_root = fallback_root
config.version_scheme = version_scheme
config.local_scheme = local_scheme
config.write_to = write_to
config.write_to_template = write_to_template
config.relative_to = relative_to
config.tag_regex = tag_regex
+ config.fallback_version = fallback_version
config.parse = parse
config.git_describe_command = git_describe_command
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-3.2.0/src/setuptools_scm/config.py
new/setuptools_scm-3.3.3/src/setuptools_scm/config.py
--- old/setuptools_scm-3.2.0/src/setuptools_scm/config.py 2019-01-16
20:34:04.000000000 +0100
+++ new/setuptools_scm-3.3.3/src/setuptools_scm/config.py 2019-05-12
11:31:03.000000000 +0200
@@ -44,6 +44,7 @@
local_scheme = None
write_to = None
write_to_template = None
+ fallback_version = None
_relative_to = None
parse = None
_tag_regex = None
@@ -59,11 +60,21 @@
self.local_scheme = "node-and-date"
self.write_to = ""
self.write_to_template = None
+ self.fallback_version = None
+ self.fallback_root = "."
self.parse = None
self.tag_regex = DEFAULT_TAG_REGEX
self.git_describe_command = None
@property
+ def fallback_root(self):
+ return self._fallback_root
+
+ @fallback_root.setter
+ def fallback_root(self, value):
+ self._fallback_root = os.path.abspath(value)
+
+ @property
def absolute_root(self):
return self._absolute_root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-3.2.0/src/setuptools_scm/hacks.py
new/setuptools_scm-3.3.3/src/setuptools_scm/hacks.py
--- old/setuptools_scm-3.2.0/src/setuptools_scm/hacks.py 2019-01-16
20:34:04.000000000 +0100
+++ new/setuptools_scm-3.3.3/src/setuptools_scm/hacks.py 2019-05-12
11:31:03.000000000 +0200
@@ -22,3 +22,8 @@
if not items:
return
return parse_pkginfo(os.path.join(pipdir, items[0]), config=config)
+
+
+def fallback_version(root, config=None):
+ if config.fallback_version is not None:
+ return meta(config.fallback_version, preformatted=True, config=config)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools_scm-3.2.0/src/setuptools_scm/integration.py
new/setuptools_scm-3.3.3/src/setuptools_scm/integration.py
--- old/setuptools_scm-3.2.0/src/setuptools_scm/integration.py 2019-01-16
20:34:04.000000000 +0100
+++ new/setuptools_scm-3.3.3/src/setuptools_scm/integration.py 2019-05-12
11:31:03.000000000 +0200
@@ -2,7 +2,6 @@
from .version import _warn_if_setuptools_outdated
from .utils import do
-from .discover import iter_matching_entrypoints
from . import get_version
@@ -14,12 +13,7 @@
value = {}
if getattr(value, "__call__", None):
value = value()
- # this piece of code is a hack to counter the mistake in root finding
- matching_fallbacks = iter_matching_entrypoints(
- ".", "setuptools_scm.parse_scm_fallback"
- )
- if any(matching_fallbacks):
- value.pop("root", None)
+
dist.metadata.version = get_version(**value)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-3.2.0/src/setuptools_scm/utils.py
new/setuptools_scm-3.3.3/src/setuptools_scm/utils.py
--- old/setuptools_scm-3.2.0/src/setuptools_scm/utils.py 2019-01-16
20:34:04.000000000 +0100
+++ new/setuptools_scm-3.3.3/src/setuptools_scm/utils.py 2019-05-12
11:31:03.000000000 +0200
@@ -100,7 +100,8 @@
if PY2:
argspec = inspect.getargspec(fn).args
else:
- argspec = inspect.getfullargspec(fn).args
+
+ argspec = inspect.signature(fn).parameters
return argname in argspec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools_scm-3.2.0/src/setuptools_scm.egg-info/PKG-INFO
new/setuptools_scm-3.3.3/src/setuptools_scm.egg-info/PKG-INFO
--- old/setuptools_scm-3.2.0/src/setuptools_scm.egg-info/PKG-INFO
2019-01-16 20:34:32.000000000 +0100
+++ new/setuptools_scm-3.3.3/src/setuptools_scm.egg-info/PKG-INFO
2019-05-12 11:31:28.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: setuptools-scm
-Version: 3.2.0
+Version: 3.3.3
Summary: the blessed package to manage your versions by scm tags
Home-page: https://github.com/pypa/setuptools_scm/
Author: Ronny Pfannschmidt
@@ -107,8 +107,8 @@
.. important::
- Ensure neither the ``[metadata] version`` option nor the
``[egg_info]``
- section are not defined, as these will interfere with
``setuptools_scm``.
+ Ensure neither the ``[metadata]`` ``version`` option nor the
``[egg_info]``
+ section are defined, as these will interfere with
``setuptools_scm``.
You may also need to define a ``pyproject.toml`` file (`PEP-0518
<https://www.python.org/dev/peps/pep-0518>`_) to ensure you have the
required
@@ -261,12 +261,6 @@
repository to point ``setuptools_scm`` at the root of the
repository by
supplying ``__file__``.
- :parse:
- A function that will be used instead of the discovered SCM for
parsing the
- version.
- Use with caution, this is a function for advanced use, and you
should be
- familiar with the ``setuptools_scm`` internals to use it.
-
:tag_regex:
A Python regex string to extract the version part from any SCM tag.
The regex needs to contain three named groups prefix, version and
suffix,
@@ -275,6 +269,18 @@
Defaults to the value of
``setuptools_scm.config.DEFAULT_TAG_REGEX``
(see `config.py <src/setuptools_scm/config.py>`_).
+ :fallback_version:
+ A version string that will be used if no other method for
detecting the
+ version worked (e.g., when using a tarball with no metadata). If
this is
+ unset (the default), setuptools_scm will error if it fails to
detect the
+ version.
+
+ :parse:
+ A function that will be used instead of the discovered SCM for
parsing the
+ version.
+ Use with caution, this is a function for advanced use, and you
should be
+ familiar with the ``setuptools_scm`` internals to use it.
+
:git_describe_command:
This command will be used instead the default ``git describe``
command.
Use with caution, this is a function for advanced use, and you
should be
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools_scm-3.2.0/src/setuptools_scm.egg-info/entry_points.txt
new/setuptools_scm-3.3.3/src/setuptools_scm.egg-info/entry_points.txt
--- old/setuptools_scm-3.2.0/src/setuptools_scm.egg-info/entry_points.txt
2019-01-16 20:34:32.000000000 +0100
+++ new/setuptools_scm-3.3.3/src/setuptools_scm.egg-info/entry_points.txt
2019-05-12 11:31:28.000000000 +0200
@@ -13,6 +13,7 @@
.hg_archival.txt = setuptools_scm.hg:parse_archival
PKG-INFO = setuptools_scm.hacks:parse_pkginfo
pip-egg-info = setuptools_scm.hacks:parse_pip_egg_info
+ setup.py = setuptools_scm.hacks:fallback_version
[setuptools_scm.files_command]
.hg = setuptools_scm.file_finder_hg:hg_find_files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-3.2.0/testing/conftest.py
new/setuptools_scm-3.3.3/testing/conftest.py
--- old/setuptools_scm-3.2.0/testing/conftest.py 2019-01-16
20:34:04.000000000 +0100
+++ new/setuptools_scm-3.3.3/testing/conftest.py 2019-05-12
11:31:03.000000000 +0200
@@ -63,7 +63,7 @@
__tracebackhide__ = True
from setuptools_scm import get_version
- version = get_version(root=str(self.cwd), **kw)
+ version = get_version(root=str(self.cwd), fallback_root=str(self.cwd),
**kw)
print(version)
return version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-3.2.0/testing/test_basic_api.py
new/setuptools_scm-3.3.3/testing/test_basic_api.py
--- old/setuptools_scm-3.2.0/testing/test_basic_api.py 2019-01-16
20:34:04.000000000 +0100
+++ new/setuptools_scm-3.3.3/testing/test_basic_api.py 2019-05-12
11:31:03.000000000 +0200
@@ -1,4 +1,5 @@
import os
+import sys
import py
import pytest
@@ -22,8 +23,9 @@
assert res == {"name": "test", "revision": "1"}
-def test_version_from_pkginfo(wd):
+def test_version_from_pkginfo(wd, monkeypatch):
wd.write("PKG-INFO", "Version: 0.1")
+
assert wd.version == "0.1"
# replicate issue 167
@@ -56,6 +58,18 @@
setuptools_scm.get_version(root=tmpdir.strpath)
+def test_fallback(tmpdir, monkeypatch):
+ monkeypatch.delenv("SETUPTOOLS_SCM_DEBUG")
+ p = tmpdir.ensure("sub/package", dir=1)
+ p.join("setup.py").write(
+ """from setuptools import setup
+setup(use_scm_version={"fallback_version": "12.34"})
+"""
+ )
+ res = do((sys.executable, "setup.py", "--version"), p)
+ assert res == "12.34"
+
+
@pytest.mark.parametrize(
"version", ["1.0", "1.2.3.dev1+ge871260",
"1.2.3.dev15+ge871260.d20180625", "2345"]
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-3.2.0/testing/test_git.py
new/setuptools_scm-3.3.3/testing/test_git.py
--- old/setuptools_scm-3.2.0/testing/test_git.py 2019-01-16
20:34:04.000000000 +0100
+++ new/setuptools_scm-3.3.3/testing/test_git.py 2019-05-12
11:31:03.000000000 +0200
@@ -1,3 +1,5 @@
+import sys
+
from setuptools_scm import integration
from setuptools_scm.utils import do
from setuptools_scm import git
@@ -29,6 +31,19 @@
assert parsed == (tag, number, node, dirty)
+def test_root_relative_to(tmpdir, wd, monkeypatch):
+ monkeypatch.delenv("SETUPTOOLS_SCM_DEBUG")
+ p = wd.cwd.ensure("sub/package", dir=1)
+ p.join("setup.py").write(
+ """from setuptools import setup
+setup(use_scm_version={"root": "../..",
+ "relative_to": __file__})
+"""
+ )
+ res = do((sys.executable, "setup.py", "--version"), p)
+ assert res == "0.1.dev0"
+
+
@pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/298";)
def test_file_finder_no_history(wd, caplog):
file_list = git_find_files(str(wd.cwd))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-3.2.0/testing/test_regressions.py
new/setuptools_scm-3.3.3/testing/test_regressions.py
--- old/setuptools_scm-3.2.0/testing/test_regressions.py 2019-01-16
20:34:04.000000000 +0100
+++ new/setuptools_scm-3.3.3/testing/test_regressions.py 2019-05-12
11:31:03.000000000 +0200
@@ -29,7 +29,7 @@
do("git init", p.dirpath())
res = do((sys.executable, "setup.py", "--version"), p)
- assert res == "1.0"
+ assert res == "0.1.dev0"
def test_pip_egg_info(tmpdir, monkeypatch):
@@ -43,10 +43,10 @@
)
with pytest.raises(LookupError):
- get_version(root=p.strpath)
+ get_version(root=p.strpath, fallback_root=p.strpath)
p.ensure("pip-egg-info/random.egg-info/PKG-INFO").write("Version: 1.0")
- assert get_version(root=p.strpath) == "1.0"
+ assert get_version(root=p.strpath, fallback_root=p.strpath) == "1.0"
@pytest.mark.issue(164)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-3.2.0/tox.ini
new/setuptools_scm-3.3.3/tox.ini
--- old/setuptools_scm-3.2.0/tox.ini 2019-01-16 20:34:04.000000000 +0100
+++ new/setuptools_scm-3.3.3/tox.ini 2019-05-12 11:31:03.000000000 +0200
@@ -1,8 +1,10 @@
[tox]
-envlist=py{27,34,35,36,37}-test,flake8,check_readme,py{27,37}-selfcheck
+envlist=py{27,34,35,36,37,38}-test,flake8,check_readme,py{27,37}-selfcheck
[pytest]
filterwarnings=error
+markers=
+ issue(id): reference to github issue
[flake8]
max-complexity = 10
