7 changed files with 106 additions and 244 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,5 +3,3 @@
 /APScheduler-3.6.3.tar.gz
 /APScheduler-3.7.0.tar.gz
 /APScheduler-3.8.0.tar.gz
-/APScheduler-3.10.4.tar.gz
-/apscheduler-3.11.0.tar.gz
--- a/.packit.yaml
+++ b/.packit.yaml
@ -1,38 +0,0 @@
-# See the documentation for more information:
-# https://packit.dev/docs/configuration/
- 
-specfile_path: python-APScheduler.spec
- 
-upstream_package_name: APScheduler
-downstream_package_name: python-APScheduler
-upstream_project_url: https://github.com/agronholm/apscheduler
-version_update_mask: '\d+\.'
-upstream_tag_exclude: "^4.[0-9].[0-9]a"  # exclude version 4 alpha releases
-
-packit_instances: ["stg"]
- 
-jobs:
-  - job: copr_build
-    owner: mmassari
-    project: apscheduler
-    trigger: pull_request
-    targets: 
-      - fedora-all
-
-  - job: pull_from_upstream
-    trigger: release
-    dist_git_branches:
-      - fedora-all
- 
-  - job: koji_build
-    trigger: commit
-    allowed_pr_authors: ["packit-stg", "packit", "mmassari"]
-    allowed_committers: ["mmassari"]
-    dist_git_branches:
-      - fedora-all
- 
-  - job: bodhi_update
-    trigger: commit
-    dist_git_branches:
-      - fedora-branched # rawhide updates are created automatically
-
--- a/01-test-executors.patch
+++ b/01-test-executors.patch
@ -1,102 +0,0 @@
-diff --git a/setup.cfg b/setup.cfg
-index 002111f..012cff4 100644
--- a/setup.cfg
-+++ b/setup.cfg
-@@ -7,7 +7,7 @@ upload-dir = docs/_build/html
- 
- [tool:pytest]
- asyncio_mode = strict
-addopts = -rsx --cov --tb=short
-+addopts = -rsx --tb=short
- testpaths = tests
- 
- [coverage:run]
-diff --git a/setup.py b/setup.py
-index cd93e10..59f5a80 100644
--- a/setup.py
-+++ b/setup.py
-@@ -56,7 +56,6 @@ setup(
-         'testing': [
-             'pytest',
-             'pytest_asyncio',
-            'pytest-cov',
-             'pytest-tornado5'
-         ],
-         'doc': [
-diff --git a/tests/test_executors.py b/tests/test_executors.py
-index d67e187..0140dbe 100644
--- a/tests/test_executors.py
-+++ b/tests/test_executors.py
-@@ -5,6 +5,7 @@ import gc
- import os
- import signal
- import time
-+from time import sleep
- 
- import pytest
- from pytz import UTC
-@@ -36,11 +37,11 @@ def executor(request, mock_scheduler):
-         executor_ = ThreadPoolExecutor()
-     else:
-         from apscheduler.executors.pool import ProcessPoolExecutor
-        executor_ = ProcessPoolExecutor()
-+        executor_ = ProcessPoolExecutor(4, {"max_tasks_per_child": 1})
- 
-     executor_.start(mock_scheduler, 'dummy')
-     yield executor_
-    executor_.shutdown()
-+    executor_.shutdown(True)
- 
- 
- def wait_event():
-@@ -60,12 +61,12 @@ def test_max_instances(mock_scheduler, executor, create_job, freeze_time):
-     """Tests that the maximum instance limit on a job is respected."""
-     events = []
-     mock_scheduler._dispatch_event = lambda event: events.append(event)
-    job = create_job(func=wait_event, max_instances=2, next_run_time=None)
-+    job = create_job(func=wait_event, max_instances=2, next_run_time=None, misfire_grace_time = None)
-     executor.submit_job(job, [freeze_time.current])
-     executor.submit_job(job, [freeze_time.current])
- 
-     pytest.raises(MaxInstancesReachedError, executor.submit_job, job, [freeze_time.current])
-    executor.shutdown()
-+    executor.shutdown(True)
-     assert len(events) == 2
-     assert events[0].retval == 'test'
-     assert events[1].retval == 'test'
-@@ -83,12 +84,13 @@ def test_submit_job(mock_scheduler, executor, create_job, freeze_time, timezone,
- 
-     """
-     mock_scheduler._dispatch_event = MagicMock()
-    job = create_job(func=func, id='foo')
-+    misfire_grace_time = 1 if event_code == EVENT_JOB_MISSED else None
-+    job = create_job(func=func, id='foo', misfire_grace_time=misfire_grace_time)
-     job._jobstore_alias = 'test_jobstore'
-     run_time = (timezone.localize(datetime(1970, 1, 1)) if event_code == EVENT_JOB_MISSED else
-                 freeze_time.current)
-     executor.submit_job(job, [run_time])
-    executor.shutdown()
-+    executor.shutdown(True)
- 
-     assert mock_scheduler._dispatch_event.call_count == 1
-     event = mock_scheduler._dispatch_event.call_args[0][0]
-@@ -157,18 +159,13 @@ def test_broken_pool():
- 
-     pid = [None]
-     event = Event()
-    scheduler = BackgroundScheduler(executors={'default': ProcessPoolExecutor(1)})
-+    scheduler = BackgroundScheduler(executors={'default': ProcessPoolExecutor(1, {"max_tasks_per_child": 1})})
-     scheduler.add_listener(listener, EVENT_JOB_EXECUTED)
-     scheduler.add_job(os.getpid, 'date', run_date=datetime.now(UTC))
-     scheduler.start()
- 
-     event.wait(3)
-     killed_pid = pid[0]
-    os.kill(pid[0], signal.SIGTERM)
-    try:
-        os.waitpid(pid[0], 0)
-    except OSError:
-        pass
- 
-     event.clear()
-     scheduler.add_job(os.getpid, 'date', run_date=datetime.now(UTC))
--- a/README.packit
+++ b/README.packit
@ -1,3 +0,0 @@
-This repository is maintained by packit.
-https://packit.dev/
-The file was generated using packit 0.104.1.post1.dev0+g23aec6b3.d20241128.
--- a/79
+++ b/79
@ -1,79 +0,0 @@
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jun 14 2022 Python Maint <python-maint@redhat.com> - 3.8.0-3
- Rebuilt for Python 3.11
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Sep 23 2021 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 3.8.0-1
- Update to 3.8.0 (#1917870)
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.7.0-3
- Rebuilt for Python 3.10
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan 20 2021 Fabien Boucher <fboucher@redhat.com> - 3.7.0-1
- Upstream 3.7.0 (RHBZ#1917870)
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 20 2020 Fabien Boucher <fboucher@redhat.com> - 3.6.3-3
- Update project url
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.6.3-2
- Rebuilt for Python 3.9
-
-* Wed Mar 11 2020 Fabien Boucher <fboucher@redhat.com> - 3.6.3-1
- Inport from SF packaging and bump to 3.6.3 (#1813957)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.5.3-4
- Rebuilt for Python 3.8
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sun Dec 16 2018 Miro Hrončok <mhroncok@redhat.com> - 3.5.3-2
- Subpackage python2-APScheduler has been removed
-  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
-
-* Mon Aug 20 2018 Haïkel Guémar <hguemar@fedoraproject.org> - 3.5.3-1
- Upstream 3.5.3 (RHBZ#1605579)
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.5-9
- Rebuilt for Python 3.7
-
-* Wed Feb 21 2018 Iryna Shcherbina <ishcherb@redhat.com> - 3.0.5-8
- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 3.0.5-4
- Rebuild for Python 3.6
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.5-3
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Dec 19 2015 Paul Belanger <pabelanger@redhat.com> - 3.0.5-1
- Initial packaging (#1218410)
--- a/python-APScheduler.spec
+++ b/python-APScheduler.spec
@ -1,3 +1,4 @@
+%global srcname APScheduler
 %global _description %{expand:
 Advanced Python Scheduler (APScheduler) is a Python library that lets you
 schedule your Python code to be executed later, either just once or
@ -8,50 +9,135 @@ restarted, it will then run all the jobs it should have run while it was
 offline.}

 Name:           python-APScheduler
-Version:        3.11.0
-Release:        %autorelease
+Version:        3.8.0
+Release:        2%{?dist}
 Summary:        In-process task scheduler with Cron-like capabilities

 License:        MIT
-URL:            https://pypi.org/project/APScheduler/
-Source0:        %{pypi_source apscheduler}
+URL:            https://github.com/agronholm/apscheduler
+Source0:        %pypi_source
+
 BuildArch:      noarch

 %description %_description

-%package -n python3-APScheduler
+%package -n python3-%{srcname}
 Summary:        %{summary}
 BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-setuptools_scm
+BuildRequires:  python3-pytest
+BuildRequires:  python3-pytest-asyncio
+BuildRequires:  python3-pytest-tornado
+BuildRequires:  python3-pytest-cov
+BuildRequires:  python3-tornado
+BuildRequires:  python3-twisted
+BuildRequires:  python3-redis
+BuildRequires:  python3-kazoo
+BuildRequires:  python3-gevent
+BuildRequires:  python3-sqlalchemy
+BuildRequires:  python3-pymongo
+BuildRequires:  python3-pytz
+BuildRequires:  python3-tzlocal
+%{?python_provide:%python_provide python3-%{srcname}}

-%description -n python3-APScheduler %_description
+%description -n python3-%{srcname} %_description

 %prep
-%autosetup -n apscheduler-%{version} -p1
+%autosetup -n %{srcname}-%{version} -p1
 # Remove that test as it require services (redis, zookeeper, ...)
 # up and running. Upstream provides a docker compose to spawn
 # services before running these tests.
 rm tests/test_jobstores.py
-# Skip missing dependencies in Fedora 42
-sed -i 's/    "anyio >= 4.5.2",//' pyproject.toml
-sed -i 's/,rethinkdb//' pyproject.toml
-
-%generate_buildrequires
-%pyproject_buildrequires -x test -x tornado

 %build
-%pyproject_wheel
+%py3_build

 %install
-%pyproject_install
-%pyproject_save_files apscheduler
+%py3_install

 %check
 # Default timezone to UTC otherwise unit tests fail.
 export TZ=UTC
-%pytest
+%{python3} -m pytest -s tests

-%files -n python3-APScheduler -f %{pyproject_files}
+%files -n python3-%{srcname}
+%license LICENSE.txt
 %doc README.rst
+%{python3_sitelib}/%{srcname}-*.egg-info/
+%{python3_sitelib}/apscheduler/

 %changelog
-%autochangelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Sep 23 2021 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 3.8.0-1
+- Update to 3.8.0 (#1917870)
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.7.0-3
+- Rebuilt for Python 3.10
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jan 20 2021 Fabien Boucher <fboucher@redhat.com> - 3.7.0-1
+- Upstream 3.7.0 (RHBZ#1917870)
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 20 2020 Fabien Boucher <fboucher@redhat.com> - 3.6.3-3
+- Update project url
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.6.3-2
+- Rebuilt for Python 3.9
+
+* Wed Mar 11 2020 Fabien Boucher <fboucher@redhat.com> - 3.6.3-1
+- Inport from SF packaging and bump to 3.6.3 (#1813957)
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.5.3-4
+- Rebuilt for Python 3.8
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sun Dec 16 2018 Miro Hrončok <mhroncok@redhat.com> - 3.5.3-2
+- Subpackage python2-APScheduler has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
+* Mon Aug 20 2018 Haïkel Guémar <hguemar@fedoraproject.org> - 3.5.3-1
+- Upstream 3.5.3 (RHBZ#1605579)
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.5-9
+- Rebuilt for Python 3.7
+
+* Wed Feb 21 2018 Iryna Shcherbina <ishcherb@redhat.com> - 3.0.5-8
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 3.0.5-4
+- Rebuild for Python 3.6
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.5-3
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sat Dec 19 2015 Paul Belanger <pabelanger@redhat.com> - 3.0.5-1
+- Initial packaging (#1218410)
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (apscheduler-3.11.0.tar.gz) = c66d87773d3fe353e5f0bbc4bc9ba05337b555db0810e42e2e384fd9717438fda501d0c724cd7180010b11e5d8db901922b79a163aec3a420a6a65eafb6f39f6
+SHA512 (APScheduler-3.8.0.tar.gz) = 669770409113835bab772ef76030487171c79d0bbe78a61999a92c4312adefa51eb53305db700039f47ed1b22675b1a831d35f5a83c248f2f5bd55ca75b548c7