[Python-modules-commits] [python-simpy3] 01/05: Import python-simpy3_3.0.10.orig.tar.gz
Wolfgang Borgert
debacle at moszumanska.debian.org
Mon Sep 26 23:41:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
debacle pushed a commit to branch master
in repository python-simpy3.
commit 8b76fb24bacbfd049d2a5bf5d7f4f0188e454ef9
Author: W. Martin Borgert <debacle at debian.org>
Date: Tue Sep 27 00:12:52 2016 +0200
Import python-simpy3_3.0.10.orig.tar.gz
---
.coveragerc | 3 +
.hg_archival.txt | 4 +
.hgignore | 19 ++
.hgtags | 10 +
AUTHORS.txt | 11 +-
CHANGES.txt | 23 +-
MANIFEST.in | 3 +
PKG-INFO | 316 ----------------------------
README.txt | 24 +--
docs/_templates/index.html | 11 +-
docs/about/.history.rst.swp | Bin 36864 -> 0 bytes
docs/about/defense_of_design.rst | 4 +-
docs/about/history.rst | 17 ++
docs/about/license.rst | 1 +
docs/about/ports.rst | 7 +-
docs/api_reference/.simpy.resources.rst.swp | Bin 12288 -> 0 bytes
docs/api_reference/simpy.resources.rst | 6 +
docs/api_reference/simpy.rt.rst | 39 +++-
docs/conf.py | 77 ++++---
docs/conftest.py | 4 +-
docs/conftest.pyc | Bin 4631 -> 0 bytes
docs/examples/code/machine_shop.py | 2 +-
docs/examples/code/process_communication.py | 4 +-
docs/simpy_intro/installation.rst | 9 +-
docs/simpy_intro/process_interaction.rst | 4 +-
docs/topical_guides/environments.rst | 4 +-
docs/topical_guides/index.rst | 2 +-
docs/topical_guides/monitoring.rst | 306 +++++++++++++++++++++++++++
docs/topical_guides/resources.rst | 59 +++++-
requirements.txt | 42 ++--
setup.cfg | 12 +-
setup.py | 12 +-
simpy.egg-info/PKG-INFO | 316 ----------------------------
simpy.egg-info/SOURCES.txt | 256 ----------------------
simpy.egg-info/dependency_links.txt | 1 -
simpy.egg-info/top_level.txt | 1 -
{simpy => src/simpy}/__init__.py | 14 +-
{simpy => src/simpy}/_compat.py | 23 +-
{simpy => src/simpy}/core.py | 4 +-
{simpy => src/simpy}/events.py | 106 +++++++---
{simpy => src/simpy}/resources/__init__.py | 0
{simpy => src/simpy}/resources/base.py | 16 +-
{simpy => src/simpy}/resources/container.py | 0
{simpy => src/simpy}/resources/resource.py | 12 +-
{simpy => src/simpy}/resources/store.py | 39 ++++
{simpy => src/simpy}/rt.py | 12 +-
{simpy => src/simpy}/util.py | 12 --
{simpy/test => tests}/__init__.py | 0
{simpy/test => tests}/conftest.py | 0
tests/test_benchmark.py | 163 ++++++++++++++
{simpy/test => tests}/test_condition.py | 0
{simpy/test => tests}/test_environment.py | 0
{simpy/test => tests}/test_event.py | 27 +++
{simpy/test => tests}/test_exceptions.py | 74 +++++--
{simpy/test => tests}/test_interrupts.py | 0
{simpy/test => tests}/test_process.py | 0
{simpy/test => tests}/test_resources.py | 119 ++++++++++-
{simpy/test => tests}/test_rt.py | 6 +-
{simpy/test => tests}/test_timeout.py | 0
{simpy/test => tests}/test_util.py | 0
tox.ini | 24 ++-
61 files changed, 1155 insertions(+), 1105 deletions(-)
diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000..fa8c185
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,3 @@
+[run]
+branch = True
+include = src/simpy/*,docs/*,tests/*
diff --git a/.hg_archival.txt b/.hg_archival.txt
new file mode 100644
index 0000000..314cba0
--- /dev/null
+++ b/.hg_archival.txt
@@ -0,0 +1,4 @@
+repo: 7dc8a5286acb335c20950fe8bb88b23196ca5138
+node: f8653514008e38030106b802ca66366571d8e5ac
+branch: default
+tag: 3.0.10
diff --git a/.hgignore b/.hgignore
new file mode 100644
index 0000000..f8ec981
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,19 @@
+syntax: glob
+
+*.egg-info/
+*.pyc
+*.pyo
+*.swp
+*~
+__pycache__
+.DS_Store
+.coverage
+.ropeproject/
+.tox/
+.cache/
+MANIFEST
+build/
+dist/
+docs/_build/
+htmlcov/
+.env
diff --git a/.hgtags b/.hgtags
new file mode 100644
index 0000000..ac58c26
--- /dev/null
+++ b/.hgtags
@@ -0,0 +1,10 @@
+480c9c2f4e17b006bcac4071add939fb88d2c54d 3.0
+152ef01b1267cf8a753774c3d66afae95e739466 3.0.1
+4c9390d76241f89a5cb50baf54fcccd6dd45f315 3.0.2
+3c17cc7e52a4cd866327fe7e18167cc6145706b9 3.0.3
+77569827abf65591cc963141741ec3006882d0e6 3.0.4
+c1566b24ba27e32e92fdfdaf01a4ddc3d61fd367 3.0.5
+e11044f09a546b4844e95b098a02e298d8afeb15 3.0.6
+ad434ce74e21304dfe220168a97527627310804f 3.0.7
+19592f56f31e5d0bcc9225da0755c936e0d6fb00 3.0.8
+9858a2079e685adcd389916bfb44ca4d8694b5ee 3.0.9
diff --git a/AUTHORS.txt b/AUTHORS.txt
index dcd150b..9910e72 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -11,5 +11,12 @@ pieces that may get forgotten :-)
We’d also like to thank:
-- Johannes Koomer for a fix for Store._put.
-- Steven Kennedy for a lot of documentation and example fixes
+- Johannes Koomer
+- Steven Kennedy
+- Matthew Grogan
+- Sean Reed
+- Christoph Körner
+- Andreas Beham
+- Larissa Reis
+- Peter Grayson
+- Cristian Klein
diff --git a/CHANGES.txt b/CHANGES.txt
index aae80e6..2922a3d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,27 @@
Changelog for SimPy
===================
-3.0.7 - 2015-03-01
+3.0.10 – 2016-08-26
+-------------------
+
+- [FIX] Conditions no longer leak callbacks on events (thanks to Peter Grayson).
+
+3.0.9 – 2016-06-12
+------------------
+
+- [NEW] PriorityStore resource and performance benchmarks were implemented by
+ Peter Grayson.
+- [FIX] Support for identifying nested preemptions was added by Cristian Klein.
+
+3.0.8 – 2015-06-23
+------------------
+
+- [NEW] Added a monitoring guide to the documentation.
+- [FIX] Improved packaging (thanks to Larissa Reis).
+- [FIX] Fixed and improved various test cases.
+
+
+3.0.7 – 2015-03-01
------------------
- [FIX] State of resources and requests were inconsistent before the request
@@ -14,6 +34,7 @@ Changelog for SimPy
- [FIX] Callback modification during event processing is now prohibited (thanks
to Andreas Beham).
+
3.0.6 - 2015-01-30
------------------
diff --git a/MANIFEST.in b/MANIFEST.in
index b32fcbe..23e9fd8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,3 +2,6 @@ include *.cfg
include *.ini
include *.txt
recursive-include docs *
+recursive-exclude docs *.pyc
+recursive-exclude docs/_build *
+recursive-exclude docs/__pycache__ *
diff --git a/PKG-INFO b/PKG-INFO
deleted file mode 100644
index 761fcae..0000000
--- a/PKG-INFO
+++ /dev/null
@@ -1,316 +0,0 @@
-Metadata-Version: 1.1
-Name: simpy
-Version: 3.0.7
-Summary: Event discrete, process based simulation for Python.
-Home-page: https://simpy.rtfd.org
-Author: Ontje Lünsdorf, Stefan Scherfke
-Author-email: the_com at gmx.de; stefan at sofa-rockers.org
-License: MIT License
-Download-URL: https://bitbucket.org/simpy/simpy/downloads
-Description: SimPy
- =====
-
- SimPy is a process-based discrete-event simulation framework based on standard
- Python. Its event dispatcher is based on Python’s `generators`__ and can also
- be used for asynchronous networking or to implement multi-agent systems (with
- both, simulated and real communication).
-
- Processes in SimPy are defined by Python generator functions and can, for
- example, be used to model active components like customers, vehicles or agents.
- SimPy also provides various types of shared *resources* to model limited
- capacity congestion points (like servers, checkout counters and tunnels).
-
- Simulations can be performed “as fast as possible”, in real time (wall clock
- time) or by manually stepping through the events.
-
- Though it is theoretically possible to do continuous simulations with SimPy, it
- has no features that help you with that. Also, SimPy is not really required for
- simulations with a fixed step size and where your processes don’t interact with
- each other or with shared resources.
-
- The SimPy distribution contains tutorials, in-depth documentation, and a large
- number of examples.
-
- SimPy is released under the MIT License. Simulation model developers are
- encouraged to share their SimPy modeling techniques with the SimPy community.
- Please post a message to the `SimPy-Users mailing list`__.
-
- There is an introductory talk that explains SimPy’s concepts and provides some
- examples: `watch the video`__ or `get the slides`__.
-
- __ http://docs.python.org/3/glossary.html#term-generator
- __ http://lists.sourceforge.net/lists/listinfo/simpy-users
- __ https://www.youtube.com/watch?v=Bk91DoAEcjY
- __ http://stefan.sofa-rockers.org/downloads/simpy-ep14.pdf
-
-
- A Simple Example
- ----------------
-
- One of SimPy's main goals is to be easy to use. Here is an example for a simple
- SimPy simulation: a *clock* process that prints the current simulation time at
- each step:
-
- .. code-block:: python
-
- >>> import simpy
- >>>
- >>> def clock(env, name, tick):
- ... while True:
- ... print(name, env.now)
- ... yield env.timeout(tick)
- ...
- >>> env = simpy.Environment()
- >>> env.process(clock(env, 'fast', 0.5))
- <Process(clock) object at 0x...>
- >>> env.process(clock(env, 'slow', 1))
- <Process(clock) object at 0x...>
- >>> env.run(until=2)
- fast 0
- slow 0
- fast 0.5
- slow 1
- fast 1.0
- fast 1.5
-
- Installation
- ------------
-
- SimPy requires Python 2.7, 3.2, PyPy 2.0 or above.
-
- You can install SimPy easily via `pip <http://pypi.python.org/pypi/pip>`_:
-
- .. code-block:: bash
-
- $ pip install -U simpy
-
- You can also download and install SimPy manually:
-
- .. code-block:: bash
-
- $ cd where/you/put/simpy/
- $ python setup.py install
-
- To run SimPy’s test suite on your installation, execute:
-
- .. code-block:: bash
-
- $ python -c "import simpy; simpy.test()"
-
- Of course, you can keep working with SimPy 2:
-
- .. code-block:: bash
-
- $ pip install "simpy>=2.3,<3"
-
-
- Getting started
- ---------------
-
- If you’ve never used SimPy before, the `SimPy tutorial`__ is a good starting
- point for you. You can also try out some of the `Examples`__ shipped with
- SimPy.
-
- __ https://simpy.readthedocs.org/en/latest/simpy_intro/index.html
- __ https://simpy.readthedocs.org/en/latest/examples/index.html
-
-
- Documentation and Help
- ----------------------
-
- You can find `a tutorial`__, `examples`__, `topical guides`__ and an `API
- reference`__, as well as some information about `SimPy and its history`__ in
- our `online documentation`__. For more help, contact the `SimPy-Users mailing
- list`__. SimPy users are pretty helpful. You can, of course, also dig through
- the `source code`__.
-
- If you find any bugs, please post them on our `issue tracker`__.
-
- __ https://simpy.readthedocs.org/en/latest/simpy_intro/index.html
- __ https://simpy.readthedocs.org/en/latest/examples/index.html
- __ https://simpy.readthedocs.org/en/latest/topical_guides/index.html
- __ https://simpy.readthedocs.org/en/latest/api_reference/index.html
- __ https://simpy.readthedocs.org/en/latest/about/index.html
- __ https://simpy.readthedocs.org/
- __ mailto:simpy-users at lists.sourceforge.net
- __ https://bitbucket.org/simpy/simpy/src
- __ https://bitbucket.org/simpy/simpy/issues?status=new&status=open
-
- Enjoy simulation programming in SimPy!
-
-
- Ports
- -----
-
- An almost feature-complete reimplementation of SimPy in C# was written by
- Andreas Beham and is available at `github.com/abeham/SimSharp`__
-
- __ http://github.com/abeham/SimSharp
-
-
- Changelog for SimPy
- ===================
-
- 3.0.7 - 2015-03-01
- ------------------
-
- - [FIX] State of resources and requests were inconsistent before the request
- has been processed (`issue #62 <https://bitbucket.org/simpy/simpy/issue/
- 62>`__).
- - [FIX] Empty conditions were never triggered (regression in 3.0.6, `issue #63
- <https://bitbucket.org/simpy/simpy/issue/63>`__).
- - [FIX] ``Environment.run()`` will fail if the until event does not get
- triggered (`issue #64 <https://bitbucket.org/simpy/simpy/issue/64>`__).
- - [FIX] Callback modification during event processing is now prohibited (thanks
- to Andreas Beham).
-
- 3.0.6 - 2015-01-30
- ------------------
-
- - [NEW] Guide to SimPy resources.
- - [CHANGE] Improve performance of condition events.
- - [CHANGE] Improve performance of filter store (thanks to Christoph Körner).
- - [CHANGE] Exception tracebacks are now more compact.
- - [FIX] ``AllOf`` conditions handle already processed events correctly (`issue
- #52 <https://bitbucket.org/simpy/simpy/issue/52>`__).
- - [FIX] Add ``sync()`` to ``RealtimeEnvironment`` to reset its internal
- wall-clock reference time (`issue #42 <https://bitbucket.org/simpy/simpy/
- issue/42>`__).
- - [FIX] Only send copies of exceptions into processes to prevent traceback
- modifications.
- - [FIX] Documentation improvements.
-
-
- 3.0.5 – 2014-05-14
- ------------------
-
- - [CHANGE] Move interruption and all of the safety checks into a new event
- (`pull request #30`__)
- - [FIX] ``FilterStore.get()`` now behaves correctly (`issue #49`__).
- - [FIX] Documentation improvements.
-
- __ https://bitbucket.org/simpy/simpy/pull-request/30
- __ https://bitbucket.org/simpy/simpy/issue/49
-
-
- 3.0.4 – 2014-04-07
- ------------------
-
- - [NEW] Verified, that SimPy works on Python 3.4.
- - [NEW] Guide to SimPy events
- - [CHANGE] The result dictionary for condition events (``AllOF`` / ``&`` and
- ``AnyOf`` / ``|``) now is an *OrderedDict* sorted in the same way as the
- original events list.
- - [CHANGE] Condition events now also except processed events.
- - [FIX] ``Resource.request()`` directly after ``Resource.release()`` no longer
- successful. The process now has to wait as supposed to.
- - [FIX] ``Event.fail()`` now accept all exceptions derived from
- ``BaseException`` instead of only ``Exception``.
-
-
- 3.0.3 – 2014-03-06
- ------------------
-
- - [NEW] Guide to SimPy basics.
- - [NEW] Guide to SimPy Environments.
- - [FIX] Timing problems with real time simulation on Windows (issue #46).
- - [FIX] Installation problems on Windows due to Unicode errors (issue #41).
- - [FIX] Minor documentation issues.
-
-
- 3.0.2 – 2013-10-24
- ------------------
-
- - [FIX] The default capacity for ``Container`` and ``FilterStore`` is now also
- ``inf``.
-
-
- 3.0.1 – 2013-10-24
- ------------------
-
- - [FIX] Documentation and default parameters of ``Store`` didn't match. Its
- default capacity is now ``inf``.
-
-
- 3.0 – 2013-10-11
- ----------------
-
- SimPy 3 has been completely rewritten from scratch. Our main goals were to
- simplify the API and code base as well as making SimPy more flexible and
- extensible. Some of the most important changes are:
-
- - Stronger focus on events. Processes yield event instances and are suspended
- until the event is triggered. An example for an event is a *timeout*
- (formerly known as *hold*), but even processes are now events, too (you can
- wait until a process terminates).
-
- - Events can be combined with ``&`` (and) and ``|`` (or) to create
- *condition events*.
-
- - Process can now be defined by any generator function. You don't have to
- subclass ``Process`` anymore.
-
- - No more global simulation state. Every simulation stores its state in an
- *environment* which is comparable to the old ``Simulation`` class.
-
- - Improved resource system with newly added resource types.
-
- - Removed plotting and GUI capabilities. `Pyside`__ and `matplotlib`__ are much
- better with this.
-
- - Greatly improved test suite. Its cleaner, and the tests are shorter and more
- numerous.
-
- - Completely overhauled documentation.
-
- There is a `guide for porting from SimPy 2 to SimPy 3`__. If you want to stick
- to SimPy 2 for a while, change your requirements to ``'SimPy>=2.3,<3'``.
-
- All in all, SimPy has become a framework for asynchronous programming based on
- coroutines. It brings more than ten years of experience and scientific know-how
- in the field of event-discrete simulation to the world of asynchronous
- programming and should thus be a solid foundation for everything based on an
- event loop.
-
- You can find information about older versions on the `history page`__
-
- __ http://qt-project.org/wiki/PySide
- __ http://matplotlib.org/
- __ https://simpy.readthedocs.org/en/latest/topical_guides/porting_from_simpy2.html
- __ https://simpy.readthedocs.org/en/latest/about/history.html
-
-
- Authors
- =======
-
- SimPy was originally created by Klaus G. Müller and Tony Vignaux in 2002.
-
- In 2008, Ontje Lünsdorf and Stefan Scherfke started to contribute to SimPy and
- became active maintainers in 2011.
-
- In 2011, Karen Turner came on board to generally help with all the bits and
- pieces that may get forgotten :-)
-
- We’d also like to thank:
-
- - Johannes Koomer for a fix for Store._put.
- - Steven Kennedy for a lot of documentation and example fixes
-
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Education
-Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.2
-Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Scientific/Engineering
diff --git a/README.txt b/README.txt
index 75de545..6937c7b 100644
--- a/README.txt
+++ b/README.txt
@@ -24,13 +24,13 @@ number of examples.
SimPy is released under the MIT License. Simulation model developers are
encouraged to share their SimPy modeling techniques with the SimPy community.
-Please post a message to the `SimPy-Users mailing list`__.
+Please post a message to the `SimPy mailing list`__.
There is an introductory talk that explains SimPy’s concepts and provides some
examples: `watch the video`__ or `get the slides`__.
__ http://docs.python.org/3/glossary.html#term-generator
-__ http://lists.sourceforge.net/lists/listinfo/simpy-users
+__ https://groups.google.com/forum/#!forum/python-simpy
__ https://www.youtube.com/watch?v=Bk91DoAEcjY
__ http://stefan.sofa-rockers.org/downloads/simpy-ep14.pdf
@@ -64,6 +64,7 @@ each step:
fast 1.0
fast 1.5
+
Installation
------------
@@ -86,13 +87,7 @@ To run SimPy’s test suite on your installation, execute:
.. code-block:: bash
- $ python -c "import simpy; simpy.test()"
-
-Of course, you can keep working with SimPy 2:
-
-.. code-block:: bash
-
- $ pip install "simpy>=2.3,<3"
+ $ py.test --pyargs simpy
Getting started
@@ -111,7 +106,7 @@ Documentation and Help
You can find `a tutorial`__, `examples`__, `topical guides`__ and an `API
reference`__, as well as some information about `SimPy and its history`__ in
-our `online documentation`__. For more help, contact the `SimPy-Users mailing
+our `online documentation`__. For more help, contact the `SimPy mailing
list`__. SimPy users are pretty helpful. You can, of course, also dig through
the `source code`__.
@@ -123,7 +118,7 @@ __ https://simpy.readthedocs.org/en/latest/topical_guides/index.html
__ https://simpy.readthedocs.org/en/latest/api_reference/index.html
__ https://simpy.readthedocs.org/en/latest/about/index.html
__ https://simpy.readthedocs.org/
-__ mailto:simpy-users at lists.sourceforge.net
+__ mailto:python-simpy at googlegroups.com
__ https://bitbucket.org/simpy/simpy/src
__ https://bitbucket.org/simpy/simpy/issues?status=new&status=open
@@ -133,7 +128,8 @@ Enjoy simulation programming in SimPy!
Ports
-----
-An almost feature-complete reimplementation of SimPy in C# was written by
-Andreas Beham and is available at `github.com/abeham/SimSharp`__
+Reimplementations of SimPy are available in the following languages:
-__ http://github.com/abeham/SimSharp
+- C#: `SimSharp <https://github.com/abeham/SimSharp>`_ (written by Andreas Beham)
+- Julia: `SimJulia <https://github.com/BenLauwens/SimJulia.jl>`_
+- R: `Simmer <https://github.com/r-simmer/simmer>`_
diff --git a/docs/_templates/index.html b/docs/_templates/index.html
index 62c4fe1..d4bf515 100644
--- a/docs/_templates/index.html
+++ b/docs/_templates/index.html
@@ -13,7 +13,7 @@
<a href="https://pypi.python.org/pypi/simpy">PyPI</a> |
<a href="https://bitbucket.org/simpy/simpy/">Bitbucket</a> |
<a href="https://bitbucket.org/simpy/simpy/issues?status=new&status=open">Issues</a> |
- <a href="https://lists.sourceforge.net/lists/listinfo/simpy-users">Mailing list</a></p>
+ <a href="https://groups.google.com/forum/#!forum/python-simpy">Mailing list</a></p>
<div style="margin: 0 0 .5em 1em; float: right;">
<div class="highlight-python"><div class="highlight"><pre style="padding-right: 2em;"><span class="gp">>>> </span><span class="kn">import</span> <span class="nn">simpy</span>
@@ -64,8 +64,8 @@ number of examples.</p>
<p>SimPy is released under the MIT License. Simulation model developers are
encouraged to share their SimPy modeling techniques with the SimPy community.
Please post a message to the <a
-href="http://lists.sourceforge.net/lists/listinfo/simpy-users">SimPy-Users
-mailing list</a>.</p>
+href="https://groups.google.com/forum/#!forum/python-simpy">SimPy mailing
+list</a>.</p>
<p>There is an introductory talk that explains SimPy’s concepts and provides
some examples: <a href="https://www.youtube.com/watch?v=Bk91DoAEcjY">watch
@@ -73,6 +73,9 @@ the video</a> or <a
href="http://stefan.sofa-rockers.org/downloads/simpy-ep14.pdf">get the
slides</a>.</p>
+<p>SimPy has also been reimplemented in other programming languages. See the
+<a href="{{ pathto("about/ports") }}">list of ports</a> for more details.</p>
+
<h2 style="clear: both;">Documentation</h2>
<table class="contentstable" align="center" style="margin-left: 30px">
@@ -103,7 +106,7 @@ slides</a>.</p>
</td>
<td>
<p class="biglink"><a class="biglink" href="{{ pathto("about/index") }}">About</a><br />
- <span class="linkdescr">non-technical stuff (history, change logs, …)</span></p>
+ <span class="linkdescr">non-technical stuff (history, change logs, ports, …)</span></p>
</td>
</tr>
</table>
diff --git a/docs/about/.history.rst.swp b/docs/about/.history.rst.swp
deleted file mode 100644
index 0661cdb..0000000
Binary files a/docs/about/.history.rst.swp and /dev/null differ
diff --git a/docs/about/defense_of_design.rst b/docs/about/defense_of_design.rst
index 7d927b8..6e81c59 100644
--- a/docs/about/defense_of_design.rst
+++ b/docs/about/defense_of_design.rst
@@ -15,7 +15,7 @@ actions.
In SimPy 1, you implemented a process by sub-classing ``Process``. The instance
of such a subclass carried both, process and simulation internal information,
-whereat the latter wasn't of any use to the process itself. The sequence of
+whereas the latter wasn't of any use to the process itself. The sequence of
actions of the process was specified in a method of the subclass, called the
*process execution method* (or PEM in short). A PEM interacted with the
simulation by yielding one of several keywords defined in the simulation
@@ -23,7 +23,7 @@ package.
The simulation itself was executed via module level functions. The simulation
state was stored in the global scope. This made it very easy to implement and
-execute a simulation (despite from heaving to inherit from *Process* and
+execute a simulation (despite from having to inherit from *Process* and
instantianting the processes before starting their PEMs). However, having all
simulation state global makes it hard to parallelize multiple simulations.
diff --git a/docs/about/history.rst b/docs/about/history.rst
index 8dc60be..c6c47f5 100644
--- a/docs/about/history.rst
+++ b/docs/about/history.rst
@@ -15,6 +15,21 @@ Python's generators as they proved to work very well.
The package has been hosted on Sourceforge.net since September 15th, 2002.
In June 2012, the project moved to Bitbucket.org.
+3.0.9 – 2016-06-12
+==================
+
+- [NEW] :class:`~simpy.resources.store.PriorityStore` resource and performance
+ benchmarks were implemented by Peter Grayson.
+- [FIX] Support for identifying nested preemptions was added by Cristian Klein.
+
+3.0.8 – 2015-06-23
+==================
+
+- [NEW] Added a monitoring guide to the documentation.
+- [FIX] Improved packaging (thanks to Larissa Reis).
+- [FIX] Fixed and improved various test cases.
+
+
3.0.7 - 2015-03-01
==================
@@ -28,6 +43,7 @@ In June 2012, the project moved to Bitbucket.org.
- [FIX] Callback modification during event processing is now prohibited (thanks
to Andreas Beham).
+
3.0.6 - 2015-01-30
==================
@@ -44,6 +60,7 @@ In June 2012, the project moved to Bitbucket.org.
modifications.
- [FIX] Documentation improvements.
+
3.0.5 – 2014-05-14
==================
diff --git a/docs/about/license.rst b/docs/about/license.rst
index 04daff5..9ccff37 100644
--- a/docs/about/license.rst
+++ b/docs/about/license.rst
@@ -2,3 +2,4 @@
License
=======
+.. literalinclude:: ../../LICENSE.txt
diff --git a/docs/about/ports.rst b/docs/about/ports.rst
index 8d69a62..a55b6dc 100644
--- a/docs/about/ports.rst
+++ b/docs/about/ports.rst
@@ -2,7 +2,8 @@
Ports
=====
-An almost feature-complete reimplementation of SimPy in C# was written by
-Andreas Beham and is available at `github.com/abeham/SimSharp`__
+Reimplementations of SimPy are available in the following languages:
-__ http://github.com/abeham/SimSharp
+- C#: `SimSharp <https://github.com/abeham/SimSharp>`_ (written by Andreas Beham)
+- Julia: `SimJulia <https://github.com/BenLauwens/SimJulia.jl>`_
+- R: `Simmer <https://github.com/r-simmer/simmer>`_
diff --git a/docs/api_reference/.simpy.resources.rst.swp b/docs/api_reference/.simpy.resources.rst.swp
deleted file mode 100644
index 4f3c474..0000000
Binary files a/docs/api_reference/.simpy.resources.rst.swp and /dev/null differ
diff --git a/docs/api_reference/simpy.resources.rst b/docs/api_reference/simpy.resources.rst
index f155e5f..3d83144 100644
--- a/docs/api_reference/simpy.resources.rst
+++ b/docs/api_reference/simpy.resources.rst
@@ -58,6 +58,12 @@ Stores --- ``simpy.resources.store``
.. autoclass:: Store
:members:
+.. autoclass:: PriorityItem(priority, item)
+ :members: priority, item
+
+.. autoclass:: PriorityStore
+ :members:
+
.. autoclass:: FilterStore
:members:
diff --git a/docs/api_reference/simpy.rt.rst b/docs/api_reference/simpy.rt.rst
index e512ad0..29d6146 100644
--- a/docs/api_reference/simpy.rt.rst
+++ b/docs/api_reference/simpy.rt.rst
@@ -3,4 +3,41 @@
=====================================
.. automodule:: simpy.rt
- :inherited-members:
+
+.. autoclass:: RealtimeEnvironment
+
+ .. autoattribute:: now
+ .. autoattribute:: active_process
+ .. autoattribute:: factor
+ .. autoattribute:: strict
+
+ .. method:: process(generator)
+
+ Create a new :class:`~simpy.events.Process` instance for *generator*.
+
+ .. method:: timeout(delay, value=None)
+
+ Return a new :class:`~simpy.events.Timeout` event with a *delay* and,
+ optionally, a *value*.
+
+ .. method:: event()
+
+ Return a new :class:`~simpy.events.Event` instance. Yielding this event
+ suspends a process until another process triggers the event.
+
+ .. method:: all_of(events)
+
+ Return a new :class:`~simpy.events.AllOf` condition for a list of
+ *events*.
+
+ .. method:: any_of(events)
+
+ Return a new :class:`~simpy.events.AnyOf` condition for a list of
+ *events*.
+
+ .. automethod:: exit
+ .. automethod:: schedule
+ .. automethod:: peek
+ .. automethod:: step
+ .. automethod:: sync
+ .. automethod:: run
diff --git a/docs/conf.py b/docs/conf.py
index a81754b..d2331b4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,15 +19,14 @@ import sys
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('..'))
+sys.path.insert(0, os.path.abspath(os.path.join('..', 'src')))
-
-import simpy
+import simpy # noqa
# -- General configuration ----------------------------------------------------
# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+# needs_sphinx = '1.0'
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
@@ -45,7 +44,7 @@ templates_path = ['_templates']
source_suffix = '.rst'
# The encoding of source files.
-#source_encoding = 'utf-8-sig'
+# source_encoding = 'utf-8-sig'
# The master toctree document.
master_doc = 'contents'
@@ -66,13 +65,13 @@ release = simpy.__version__
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
-#language = None
+# language = None
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
-#today = ''
+# today = ''
# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
@@ -80,24 +79,24 @@ exclude_patterns = ['_build']
# The reST default role (used for this markup: `text`) to use for all
# documents.
-#default_role = None
+# default_role = None
# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True
# If true, the current module name will be prepended to all description
# unit titles (such as .. function::).
-#add_module_names = True
+# add_module_names = True
# If true, sectionauthor and moduleauthor directives will be shown in the
# output. They are ignored by default.
-#show_authors = False
+# show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'friendly'
# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []
# -- Options for HTML output --------------------------------------------------
@@ -114,26 +113,26 @@ except ImportError:
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
-#html_theme_options = {}
+# html_theme_options = {}
# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+# html_theme_path = []
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
-#html_title = None
+# html_title = None
# A shorter title for the navigation bar. Default is the same as html_title.
-#html_short_title = None
+# html_short_title = None
# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
-html_logo = '_static/simpy-logo-small.png'
+# html_logo = '_static/simpy-logo-small.png'
# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
-#html_favicon = None
+# html_favicon = None
html_favicon = '_static/favicon.ico'
# Add any paths that contain custom static files (such as style sheets) here,
@@ -143,44 +142,44 @@ html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+# html_last_updated_fmt = '%b %d, %Y'
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
-#html_use_smartypants = True
+# html_use_smartypants = True
# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}
# Additional templates that should be rendered to pages, maps page names to
# template names.
html_additional_pages = {'index': 'index.html'}
# If false, no module index is generated.
-#html_domain_indices = True
+# html_domain_indices = True
# If false, no index is generated.
-#html_use_index = True
+# html_use_index = True
# If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# html_split_index = False
# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+# html_show_sourcelink = True
# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+# html_show_sphinx = True
# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+# html_show_copyright = True
# If true, an OpenSearch description file will be output, and all pages will
# contain a <link> tag referring to it. The value of this option must be the
# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''
# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
+# html_file_suffix = None
# Output file base name for HTML help builder.
htmlhelp_basename = 'SimPydoc'
@@ -189,10 +188,10 @@ htmlhelp_basename = 'SimPydoc'
# -- Options for LaTeX output -------------------------------------------------
# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
+# latex_paper_size = 'letter'
# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
+# latex_font_size = '10pt'
# Grouping the document tree into LaTeX files. List of tuples (source start
# file, target name, title, author, documentclass [howto/manual]).
@@ -202,26 +201,26 @@ latex_documents = [
# The name of an image file (relative to this directory) to place at the top of
# the title page.
-#latex_logo = None
+# latex_logo = None
# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
-#latex_use_parts = False
+# latex_use_parts = False
# If true, show page references after internal links.
-#latex_show_pagerefs = False
+# latex_show_pagerefs = False
# If true, show URL addresses after external links.
-#latex_show_urls = False
+# latex_show_urls = False
... 2530 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-simpy3.git
More information about the Python-modules-commits
mailing list