Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

if this is to be the main repo #1

Open
wants to merge 130 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
5c8cd4c
Improve logging
c-oreills Dec 2, 2011
7867e34
add enqueue & perform timestamps, add job hooks for accessing them
joeshaw Dec 6, 2011
63b3837
Updated views to work with pystache 0.5.0
james-m-henderson Apr 18, 2012
e6655b0
Merge pull request #104 from james-m-henderson/master
binarymatt Apr 20, 2012
43459f0
Added support for timeing out workers
heynemann Apr 26, 2012
75760da
Script allow passing of timeout
heynemann Apr 26, 2012
551b47b
Adding job to the error queue after a timeout.
cezarsa Apr 27, 2012
921db92
Small cleanup
cezarsa Apr 27, 2012
a297dba
Adding basic test for workers with timeout values
cezarsa Apr 27, 2012
408b68a
Merge pull request #105 from heynemann/master
binarymatt Apr 27, 2012
db04b97
Updated as proposed in the previous pull request.
heynemann May 2, 2012
9afa179
Merge pull request #106 from heynemann/master
binarymatt May 2, 2012
8762b63
Splitting the Worker.work in two methods, no behavior changes.
cezarsa May 5, 2012
eb2cbf2
Adding test to check whether pyres identifies a crashed process as a
cezarsa May 5, 2012
f0b27b7
Adding tests for calling sys.exit() from job's perform method. (Curre…
cezarsa May 5, 2012
614d067
Adding more tests for unexpected exits during the job execution.
cezarsa May 5, 2012
56d9c08
Better handling crashes and unexpected exits in the forked worker pro…
cezarsa May 5, 2012
29128a9
Merge pull request #107 from cezarsa/master
binarymatt May 8, 2012
67d6833
version bump for release
May 9, 2012
6291432
adding travis.yml
May 29, 2012
2231739
adding travis status badge
May 29, 2012
154d91c
adding pypy to environments tested
May 29, 2012
01a0fe1
tweaking readme
May 29, 2012
31dcafd
getting ready to remove resweb
Jun 2, 2012
0f92966
removing resweb
Jun 2, 2012
605ced0
updating version and manifest
Jun 2, 2012
e57a20f
temporarily removing pypy
Jun 2, 2012
e16b1ac
Merge branch 'master' into remove_resweb
Jun 2, 2012
1db76b8
removing resweb script
Jun 2, 2012
58079c5
getting ready for new release
Jun 2, 2012
5dd360a
fixing setup.py
Jun 2, 2012
5da5543
Merge pull request #95 from joeshaw/joeshaw-timestamps
binarymatt Jun 4, 2012
7103f8a
fixing failing tests
Jun 4, 2012
f475dcb
tweaking before and after perform methods
Jun 4, 2012
7f88c13
adding payload_class to both before and after perform
Jun 7, 2012
2166c70
updating theme
Jun 7, 2012
df7fe42
tweaking job docs
Jun 7, 2012
a907e5c
removing version import
Jun 7, 2012
926bd28
Use enqueue from string as a base for enqueue
c-oreills Jun 15, 2012
8fc4e5a
Add enqueue_at_from_string
c-oreills Jun 15, 2012
9f0c177
starting to update HISTORY with new changes
Jun 30, 2012
50a57a0
Merge branch 'upstream-merge' of git://github.com/c-oreills/pyres int…
Jun 30, 2012
3a50d9a
updating authors list via git shortlog -s -n
Jul 1, 2012
982c58c
improve some logging, particularly errors that get retried
joeshaw Jan 20, 2012
fb5b97a
add PID to pyres logging format
joeshaw Jan 20, 2012
b21524d
dial down the logging a bit
joeshaw Jan 20, 2012
b02437f
require redis >= 2.4.12, not that version specifically
joeshaw Jul 18, 2012
b003384
before_perform() & after_perform() should be called on class, not pas…
joeshaw Jul 18, 2012
452acb2
Merge pull request #113 from joeshaw/joeshaw-logging
binarymatt Jul 18, 2012
c86ca29
pull setup.py install_requires from requirements.txt
joeshaw Jul 18, 2012
a4a498e
require at least simplesjon 2.0.9
joeshaw Jul 18, 2012
1e2bf45
fixing broken tests
Jul 18, 2012
e74b0f6
using correct api from redis-py
Jul 18, 2012
dab7cb8
updating for release
Jul 19, 2012
b9fe2e4
Merge pull request #114 from joeshaw/joeshaw-requirements
binarymatt Jul 19, 2012
1e91087
Merge pull request #115 from joeshaw/joeshaw-before-after-fixup
binarymatt Jul 19, 2012
046209d
SIGINFO doesn't exist on linux
Jul 30, 2012
ec18776
1.4.1 release
Jul 30, 2012
9fd9b14
adding package data
Jul 30, 2012
d54343e
adding requirements for sdist
Jul 30, 2012
2e48ebd
Add support for Redis db num in server string: i.e. localhost:6379/0
adammeghji Sep 17, 2012
b07f6d6
Merge pull request #118 from adammeghji/master
binarymatt Sep 19, 2012
2b78e44
the main module needs to get a named logger to prevent overtaking the…
iserko Sep 21, 2012
b475a74
Merge branch 'master' into dont_override_logging_root_handler
iserko Sep 21, 2012
017f305
Merge pull request #119 from iserko/dont_override_logging_root_handler
binarymatt Sep 22, 2012
b073ac0
Add exception to metadata dictionary if job fails for use in after_pe…
Oct 12, 2012
c00c160
Merge pull request #120 from discogs/exception-metadata
binarymatt Oct 13, 2012
626d017
registers worker again after a redis flush
guilhermef Nov 5, 2012
7d6569d
checking the registration after 3 iterations
guilhermef Nov 5, 2012
c7af5db
register worker on every iteration
guilhermef Nov 28, 2012
7d2843c
Merge pull request #121 from guilhermef/master
binarymatt Nov 29, 2012
104df5b
updating copyright
Jan 4, 2013
0912dcb
Modified worker_pids() to return the correct set of pids for pyres_wo…
Jan 20, 2013
548af97
Added test case for worker_pids().
Jan 20, 2013
062b548
Fixed small bug in ResQ __str__() method.
Jan 20, 2013
e119d7e
Fixed worker_pids test case.
Jan 22, 2013
d936b45
Merge pull request #122 from lcwill/worker-pids-fix
binarymatt Jan 22, 2013
97cc4c7
1.4.2 release
Jun 21, 2013
b440083
change prints
sontek Jul 13, 2013
30dd857
started the porting by adding a compat.py
sontek Jul 13, 2013
b33e01a
updated json_parser
sontek Jul 13, 2013
a4fba8a
updated coommands to by py2/py3 compat
sontek Jul 13, 2013
a4a2c9d
added tox
sontek Jul 13, 2013
4e5de75
updated dependencies to work well in py2 and 3, use bytestring in test
sontek Jul 13, 2013
6d9fcd1
impore properly
sontek Jul 13, 2013
b2374c4
update gitignore
sontek Jul 13, 2013
f27561b
Converting basestring to compat.string_types
Jul 13, 2013
52a53eb
switch to pytest
sontek Jul 13, 2013
1df8942
decode pop (we want strings!!)
sontek Jul 13, 2013
2961b5e
don't blow up in py3
sontek Jul 13, 2013
607e08d
Fixing some more worker tests
Jul 13, 2013
b624c79
we need to pass strings to decode but bytes to b64
sontek Jul 13, 2013
48a52d8
More test fixing
Jul 13, 2013
2d9905f
Merge branch 'python3' of github.com:sontek/pyres into python3
Jul 13, 2013
29e5803
support py3
sontek Jul 13, 2013
4ed56f4
More test fixing
Jul 13, 2013
6a69731
Merge branch 'python3' of github.com:sontek/pyres into python3
Jul 13, 2013
5a41810
Final fixes for py3 compat
Jul 13, 2013
06442cf
Fixed py26 support
Jul 13, 2013
1a73d1e
fixes for py26, added py33 to travis
Jul 13, 2013
f7c4308
Fixing import issue with compat.PY26
Jul 13, 2013
83d85b6
Merge pull request #127 from sontek/python3
binarymatt Jul 14, 2013
401d963
Update README.markdown
wwitzel3 Jul 15, 2013
4dd0e51
Merge pull request #128 from wwitzel3/patch-1
binarymatt Jul 15, 2013
c6c9653
Removed unnecessary lines in ResQ docstring.
Bamco Jul 16, 2013
3d0309e
Update setup.py
sontek Jul 18, 2013
3cfd0a4
Merge pull request #130 from sontek/patch-1
binarymatt Jul 18, 2013
fb8c8aa
Removed coverage.report
kracekumar Sep 17, 2013
d036a5d
Implementing password support on command line to worker, scheduler an…
morpheu Oct 11, 2013
4b747eb
getting password option to password var
morpheu Oct 14, 2013
b3ad393
Receiving command line interval properly on manager
morpheu Oct 14, 2013
d492bc3
passing interval to work method, not init
morpheu Oct 14, 2013
e25091b
implementing minions interval on manager command line
morpheu Oct 15, 2013
004efa6
replacing interval for manager_interval
morpheu Oct 15, 2013
51bcf42
concat minions logs // implementing minion max process jobs
morpheu Oct 15, 2013
0da62c4
fixing concat_minions_logs and max_jobs
morpheu Oct 15, 2013
a3cc9b1
Merge pull request #131 from kracekumar/master
binarymatt Oct 15, 2013
e3c52d1
Merge pull request #129 from Bamco/patch-1
binarymatt Oct 15, 2013
91abd48
Merge pull request #132 from morpheu/script-password
binarymatt Oct 15, 2013
3ec8d17
when getting delayed timestamps, limit the query to one result since
dcosson Oct 28, 2013
61fa5ea
Merge pull request #133 from dcosson/master
binarymatt Oct 28, 2013
fbc7bfe
version bump for new release
binarymatt Apr 17, 2014
3140ba0
adding redis support to ci
binarymatt Apr 17, 2014
49aebb2
trying 3.4 support
binarymatt Apr 17, 2014
943a4a2
Always run after_perform, you should check 'failed' key
sontek Aug 6, 2014
89811a7
Merge pull request #140 from sontek/always_run_after_perform
binarymatt Sep 1, 2014
1bc12b6
Small tweaks to example.rst
msabramo Oct 6, 2014
c100e3f
handle jobs queued by Ruby Resque with no module
May 13, 2015
d9c0bd4
Merge pull request #142 from Affectiva/resque_compatibility
binarymatt May 13, 2015
4f4b282
Merge pull request #141 from msabramo/patch-1
binarymatt May 13, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
*.pyc
build/
.coverage
*.report
*.egg-info
logs/
dist/
dist/
*.swp
*.swo
.tox/
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: python
python:
- "2.6"
- "2.7"
- "3.3"
- "3.4"
# - "pypy"
# command to install dependencies
install:
- python setup.py install
# command to run tests
script: python setup.py test
services:
- redis-server
23 changes: 18 additions & 5 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
## Authors
* Matt George
* Chris Song
* yashh
* dsc
* Alex Ezell
* Craig Hawco
* Michael Russo
* Whit Morris
* Chris Song
* Whit Morriss
* Joe Shaw
* Yashwanth Nelapati
* Cezar Sa Espinola
* Alex Ezell
* Christy O'Reilly
* Kevin McConnell
* Bernardo Heynemann
* David Schoonover
* Rob Hudson
* Salimane Adjao Moustapha
* John Hobbs
* James M. Henderson
* Iraê Carvalho
* Fabien Reboia
* Peter Teichman


Inspired by Resque, by Chris Wanstrath
24 changes: 24 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
##1.4.2 (2013-06-21)
* __str__ returns correctly with dsn
* worker_pids returns correct set of workers
* workers are re-registered on every job
* add exception metadata for after_perform method
* logger no longer overrides root logger
* support for redis db in dsn

##1.4.1 (2012-07-30)
* fix for non existent system signal for linux
* cleanup of setup.py and requirements

##1.4 (2012-06-?)
* added hooks for before and after perform methods
* fixed logging
*fixed problems with password authentication

##1.3 (2012-06-01)
* remove resweb from pyres
* resweb is now available at http://github.com/Pyres/resweb or on pypi

##1.2
* release with changes from pull requests

##1.1 (2011-06-16)
* api change based on redis-py
* setproctitle requirements fix
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2009 Matt George
Copyright (c) 2009-2013 Matt George

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1 @@
recursive-include resweb *.mustache media/*
include requirements.txt
4 changes: 4 additions & 0 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Pyres - a Resque clone

Because of some differences between ruby and python, there are a couple of places where I chose speed over correctness. The goal will be to eventually take the application and make it more pythonic without sacrificing the awesome functionality found in resque. At the same time, I hope to stay within the bounds of the original api and web interface.

## Travis CI

Currently, pyres is being tested via travis ci for python version 2.6, 2.7, and 3.3:
[![Build Status](https://secure.travis-ci.org/binarydud/pyres.png)](http://travis-ci.org/binarydud/pyres)

## Running Tests

Expand Down
11 changes: 0 additions & 11 deletions coverage.report

This file was deleted.

25 changes: 25 additions & 0 deletions docs/source/_theme/flask/layout.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{%- extends "basic/layout.html" %}
{%- block extrahead %}
{{ super() }}
{% if theme_touch_icon %}
<link rel="apple-touch-icon" href="{{ pathto('_static/' ~ theme_touch_icon, 1) }}" />
{% endif %}
<link media="only screen and (max-device-width: 480px)" href="{{
pathto('_static/small_flask.css', 1) }}" type= "text/css" rel="stylesheet" />
{% endblock %}
{%- block relbar2 %}{% endblock %}
{% block header %}
{{ super() }}
{% if pagename == 'index' %}
<div class=indexwrapper>
{% endif %}
{% endblock %}
{%- block footer %}
<div class="footer">
&copy; Copyright {{ copyright }}.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
</div>
{% if pagename == 'index' %}
</div>
{% endif %}
{%- endblock %}
19 changes: 19 additions & 0 deletions docs/source/_theme/flask/relations.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<h3>Related Topics</h3>
<ul>
<li><a href="{{ pathto(master_doc) }}">Documentation overview</a><ul>
{%- for parent in parents %}
<li><a href="{{ parent.link|e }}">{{ parent.title }}</a><ul>
{%- endfor %}
{%- if prev %}
<li>Previous: <a href="{{ prev.link|e }}" title="{{ _('previous chapter')
}}">{{ prev.title }}</a></li>
{%- endif %}
{%- if next %}
<li>Next: <a href="{{ next.link|e }}" title="{{ _('next chapter')
}}">{{ next.title }}</a></li>
{%- endif %}
{%- for parent in parents %}
</ul></li>
{%- endfor %}
</ul></li>
</ul>
Loading