[Python-modules-commits] [python-simpy3] 04/05: merge patched into master
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 015c67005d7b22091948d2e4e9fd102e9dc186db
Merge: f73a12d e3c3ea5
Author: W. Martin Borgert <debacle at debian.org>
Date: Tue Sep 27 00:13:03 2016 +0200
merge patched into master
.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 +-
debian/.git-dpm | 6 +-
.../patches/use-local-intersphinx-inventory.patch | 6 +-
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 +-
63 files changed, 1161 insertions(+), 1111 deletions(-)
diff --cc debian/.git-dpm
index 62ee420,0000000..9cf6ffe
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 485513cb596b6fb4a8864d0e9af18aefbc7aebad
- 485513cb596b6fb4a8864d0e9af18aefbc7aebad
- a1b1ce0bc2f3efcec21325aaac986f74615ab73a
++e3c3ea55b3aabea73c337c508a013484fb71f4b0
++e3c3ea55b3aabea73c337c508a013484fb71f4b0
++8b76fb24bacbfd049d2a5bf5d7f4f0188e454ef9
+8b76fb24bacbfd049d2a5bf5d7f4f0188e454ef9
+python-simpy3_3.0.10.orig.tar.gz
+fa01b5f5f261fbb1a1bc7d32d7077beb87d7ddcc
+398083
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/use-local-intersphinx-inventory.patch
index 4fb881f,0000000..ffb3c15
mode 100644,000000..100644
--- a/debian/patches/use-local-intersphinx-inventory.patch
+++ b/debian/patches/use-local-intersphinx-inventory.patch
@@@ -1,24 -1,0 +1,24 @@@
- From 485513cb596b6fb4a8864d0e9af18aefbc7aebad Mon Sep 17 00:00:00 2001
++From e3c3ea55b3aabea73c337c508a013484fb71f4b0 Mon Sep 17 00:00:00 2001
+From: Larissa Reis <larissa at colivre.coop.br>
+Date: Thu, 8 Oct 2015 13:07:27 -0700
+Subject: Use local inventory when building doc instead of fetching python.org
+
+Forwarded: not-needed
+Patch-Name: use-local-intersphinx-inventory.patch
+---
+ docs/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index a81754b..bae0aff 100644
++index d2331b4..d99a290 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
- @@ -235,7 +235,7 @@ man_pages = [
++@@ -234,7 +234,7 @@ man_pages = [
+
+ # Example configuration for intersphinx: refer to the Python standard library.
+ intersphinx_mapping = {
+- 'http://docs.python.org/3/': None,
++ 'http://docs.python.org/3/': '../debian/python.org_objects.inv',
+ }
+
+ # Autodoc
--
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