Compare commits

...
Sign in to create a new pull request.

29 commits

Author SHA1 Message Date
Python Maint
b3afa94f5a Rebuilt for Python 3.14.0rc3 bytecode 2025-09-19 12:45:19 +02:00
Python Maint
a6c56914a8 Rebuilt for Python 3.14.0rc2 bytecode 2025-08-15 13:14:17 +02:00
Fedora Release Engineering
bbc55ec9b2 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 06:25:17 +00:00
Fedora Release Engineering
1db6d59dd2 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-18 11:22:18 +00:00
Maja Massarini
c0383cc868 Do not change package name 2024-11-29 15:48:09 +01:00
Maja Massarini
a91ec8ec4b Update to 3.11.0 upstream release
Upstream tag: 3.11.0
Upstream commit: 6c72a514

Commit authored by Packit automation (https://packit.dev/)
2024-11-29 09:42:44 +01:00
Maja Massarini
52c2b70a3d Relax version_update_mask
Allows releasing 3.11.0 from 3.10.0.
2024-11-28 14:54:32 +01:00
Maja Massarini
810a5c2dde Update srcname
Starting from release 3.11.0 source name is referenced with lower cases.
2024-11-28 14:47:19 +01:00
Maja Massarini
ae13079cc5 Fix test_executors when using python 3.14 2024-11-18 08:58:22 +01:00
Fedora Release Engineering
d07cd02799 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-19 09:00:01 +00:00
Python Maint
abf407bbfc Rebuilt for Python 3.13 2024-06-07 12:01:53 +02:00
Fedora Release Engineering
b5997cb342 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-26 00:43:45 +00:00
Fedora Release Engineering
24464f016a Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-21 22:51:01 +00:00
Maja Massarini
1aa35ebf3a Add version_update_mask to packit configuration 2023-11-17 09:04:59 +01:00
Maja Massarini
2bf9b3d59b Fix allowed_committers 2023-11-06 14:19:59 +00:00
Maja Massarini
eaf1d971ea Exclude automation for version 4 alpha releases 2023-11-03 14:29:48 +01:00
Maja Massarini
36b84c0146 [packit] 3.10.4 upstream release
Upstream tag: 3.10.4
Upstream commit: 2cd37918
2023-11-03 13:59:34 +01:00
Maja Massarini
e1acdc2646 Cleanup packit config file 2023-11-03 12:39:42 +01:00
Maja Massarini
ed9d3147b2 Add Packit automation for fedora releases 2023-11-03 12:13:25 +01:00
Maja Massarini
f6b6df0436 New specfile for unretirement procedure 2023-11-03 11:47:16 +01:00
Maja Massarini
be2b942295 Convert to %autorelease and %autochangelog
[skip changelog]
2023-11-03 11:47:03 +01:00
d36352d2a1 Unretirement request: https://pagure.io/releng/issue/11709 2023-10-17 08:57:11 +02:00
Miro Hrončok
37519e539e Orphaned for 6+ weeks 2022-11-08 15:30:55 +01:00
Fedora Release Engineering
9b1f6eb4ba Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-22 15:54:25 +00:00
Python Maint
99efb769b4 Rebuilt for Python 3.11 2022-06-14 14:35:02 +02:00
Fedora Release Engineering
c858224f6b - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-21 09:55:01 +00:00
Fedora Release Monitoring
96ef3125be Update to 3.8.0 (#1917870) 2021-09-24 10:05:24 +02:00
Fedora Release Engineering
ae2d27931b - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 04:32:28 +00:00
Python Maint
a4b835a338 Rebuilt for Python 3.10 2021-06-04 20:20:38 +02:00
7 changed files with 245 additions and 94 deletions

3
.gitignore vendored
View file

@ -2,3 +2,6 @@
/APScheduler-3.5.3.tar.gz
/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

38
.packit.yaml Normal file
View file

@ -0,0 +1,38 @@
# 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

102
01-test-executors.patch Normal file
View file

@ -0,0 +1,102 @@
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))

3
README.packit Normal file
View file

@ -0,0 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
The file was generated using packit 0.104.1.post1.dev0+g23aec6b3.d20241128.

79
changelog Normal file
View file

@ -0,0 +1,79 @@
* 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)

View file

@ -1,4 +1,3 @@
%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
@ -9,123 +8,50 @@ restarted, it will then run all the jobs it should have run while it was
offline.}
Name: python-APScheduler
Version: 3.7.0
Release: 2%{?dist}
Version: 3.11.0
Release: %autorelease
Summary: In-process task scheduler with Cron-like capabilities
License: MIT
URL: https://github.com/agronholm/apscheduler
Source0: %pypi_source
URL: https://pypi.org/project/APScheduler/
Source0: %{pypi_source apscheduler}
BuildArch: noarch
%description %_description
%package -n python3-%{srcname}
%package -n python3-APScheduler
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-%{srcname} %_description
%description -n python3-APScheduler %_description
%prep
%autosetup -n %{srcname}-%{version} -p1
%autosetup -n apscheduler-%{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
%py3_build
%pyproject_wheel
%install
%py3_install
%pyproject_install
%pyproject_save_files apscheduler
%check
# Default timezone to UTC otherwise unit tests fail.
export TZ=UTC
%{python3} -m pytest -s tests
%pytest
%files -n python3-%{srcname}
%license LICENSE.txt
%files -n python3-APScheduler -f %{pyproject_files}
%doc README.rst
%{python3_sitelib}/%{srcname}-*.egg-info/
%{python3_sitelib}/apscheduler/
%changelog
* 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)
%autochangelog

View file

@ -1 +1 @@
SHA512 (APScheduler-3.7.0.tar.gz) = 549f65883affb2bc6d7c24e027204151090e741a733440b94c18a68efe00503e241c95374ee51b9e059029d02197091b91fdde6696f7e162e2eb0b4d7575ff62
SHA512 (apscheduler-3.11.0.tar.gz) = c66d87773d3fe353e5f0bbc4bc9ba05337b555db0810e42e2e384fd9717438fda501d0c724cd7180010b11e5d8db901922b79a163aec3a420a6a65eafb6f39f6