diff --git a/devel/py-apscheduler/Makefile b/devel/py-apscheduler/Makefile
index 20dc18d66e9b..8722ac339a46 100644
--- a/devel/py-apscheduler/Makefile
+++ b/devel/py-apscheduler/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	apscheduler
-PORTVERSION=	3.6.3
+PORTVERSION=	3.7.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	APScheduler-${DISTVERSION}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	In-process task scheduler with Cron-like capabilities
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.2:devel/py-tzlocal@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.3:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.2<3:devel/py-tzlocal@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.3<6:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-tornado>0:devel/py-pytest-tornado@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 TEST_ENV=	${MAKE_ENV} TZ=UTC
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/ --cov//' ${WRKSRC}/${PYSETUP:R}.cfg
 	@${REINPLACE_CMD} -e 's/set_level/setLevel/' \
 		-e 's/\.records/&()/' \
 		-e '/records/s/== 1/== 2/' \
 		-e '/message/s/\[0]./[1]./' \
 		${WRKSRC}/tests/test_schedulers.py
 
 do-test:
 	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
 
 .include <bsd.port.mk>
diff --git a/devel/py-apscheduler/distinfo b/devel/py-apscheduler/distinfo
index 801e6593b8c8..2e8076a4923c 100644
--- a/devel/py-apscheduler/distinfo
+++ b/devel/py-apscheduler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573058396
-SHA256 (APScheduler-3.6.3.tar.gz) = 3bb5229eed6fbbdafc13ce962712ae66e175aa214c69bed35a06bffcf0c5e244
-SIZE (APScheduler-3.6.3.tar.gz) = 96309
+TIMESTAMP = 1611066884
+SHA256 (APScheduler-3.7.0.tar.gz) = 1cab7f2521e107d07127b042155b632b7a1cd5e02c34be5a28ff62f77c900c6a
+SIZE (APScheduler-3.7.0.tar.gz) = 97826
diff --git a/devel/py-apscheduler/files/patch-tzlocal-1.2 b/devel/py-apscheduler/files/patch-tzlocal-1.2
new file mode 100644
index 000000000000..33a839cf9b21
--- /dev/null
+++ b/devel/py-apscheduler/files/patch-tzlocal-1.2
@@ -0,0 +1,14 @@
+Partially revert https://github.com/agronholm/apscheduler/commit/b773c79ac505
+until devel/py-tzlocal is updated to 2.1
+
+--- setup.py.orig	2021-01-19 14:34:44 UTC
++++ setup.py
+@@ -41,7 +41,7 @@ setup(
+         'setuptools >= 0.7',
+         'six >= 1.4.0',
+         'pytz',
+-        'tzlocal ~= 2.0',
++        'tzlocal >= 1.2, < 3.0',
+     ],
+     extras_require={
+         ':python_version == "2.7"': ['futures'],