git: 613553ba75cc - 2021Q3 - devel/py-tempora: unbreak egg version after 9e4e943b2655

[Jan Beich]

The branch 2021Q3 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=613553ba75cc739f6d097cbe57d284fb16539db7

commit 613553ba75cc739f6d097cbe57d284fb16539db7
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-07-25 16:46:37 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-07-25 16:51:37 +0000

    devel/py-tempora: unbreak egg version after 9e4e943b2655
    
    $ flexget execute
    Traceback (most recent call last):
      File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 568, in _build_master
        ws.require(__requires__)
      File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 886, in require
        needed = self.resolve(parse_requirements(requirements))
      File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 777, in resolve
        raise VersionConflict(dist, req).with_context(dependent_req)
    pkg_resources.ContextualVersionConflict: (tempora 0.0.0 (/usr/local/lib/python3.8/site-packages), Requirement.parse('tempora>=1.8'), {'portend'})
    
    During handling of the above exception, another exception occurred:
    
    Traceback (most recent call last):
      File "/usr/local/bin/flexget", line 33, in <module>
        sys.exit(load_entry_point('FlexGet==3.1.132', 'console_scripts', 'flexget')())
      File "/usr/local/bin/flexget", line 25, in importlib_load_entry_point
        return next(matches).load()
      File "/usr/local/lib/python3.8/importlib/metadata.py", line 77, in load
        module = import_module(match.group('module'))
      File "/usr/local/lib/python3.8/importlib/__init__.py", line 127, in import_module
        return _bootstrap._gcd_import(name[level:], package, level)
      File "<frozen importlib._bootstrap>", line 1014, in _gcd_import
      File "<frozen importlib._bootstrap>", line 991, in _find_and_load
      File "<frozen importlib._bootstrap>", line 975, in _find_and_load_unlocked
      File "<frozen importlib._bootstrap>", line 671, in _load_unlocked
      File "<frozen importlib._bootstrap_external>", line 848, in exec_module
      File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
      File "/usr/local/lib/python3.8/site-packages/flexget/__init__.py", line 11, in <module>
        from flexget.manager import Manager  # noqa
      File "/usr/local/lib/python3.8/site-packages/flexget/manager.py", line 37, in <module>
        from flexget.config_schema import ConfigError
      File "/usr/local/lib/python3.8/site-packages/flexget/config_schema.py", line 14, in <module>
        from flexget.utils import qualities, template
      File "/usr/local/lib/python3.8/site-packages/flexget/utils/qualities.py", line 8, in <module>
        from flexget.utils.serialization import Serializer
      File "/usr/local/lib/python3.8/site-packages/flexget/utils/serialization.py", line 5, in <module>
        from flexget.utils import json
      File "/usr/local/lib/python3.8/site-packages/flexget/utils/json.py", line 12, in <module>
        from flexget.plugin import DependencyError
      File "/usr/local/lib/python3.8/site-packages/flexget/plugin.py", line 12, in <module>
        import pkg_resources
      File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 3243, in <module>
        def _initialize_master_working_set():
      File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 3226, in _call_aside
        f(*args, **kwargs)
      File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 3255, in _initialize_master_working_set
        working_set = WorkingSet._build_master()
      File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 570, in _build_master
        return cls._build_from_requirements(__requires__)
      File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 583, in _build_from_requirements
        dists = ws.resolve(reqs, Environment())
      File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 772, in resolve
        raise DistributionNotFound(req, requirers)
    pkg_resources.DistributionNotFound: The 'tempora>=1.8' distribution was not found and is required by portend
    
    (cherry picked from commit 941d46c34750e4ef4ffc2590c2c8a6144c987387)
---
 devel/py-tempora/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/devel/py-tempora/Makefile b/devel/py-tempora/Makefile
index cb09ec415e79..26ffac9883e4 100644
--- a/devel/py-tempora/Makefile
+++ b/devel/py-tempora/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	tempora
 PORTVERSION=	4.1.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,6 +13,7 @@ COMMENT=	Objects and routines pertaining to date and time
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.1:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jaraco.functools>=1.20:devel/py-jaraco.functools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0,1:devel/py-pytz@${PY_FLAVOR}