diff --git a/README.md b/README.md index 06b70bc..277b844 100644 --- a/README.md +++ b/README.md @@ -2,57 +2,50 @@ CROMOSIM is a Python Library for Crowd Motion Simulation. +- **Website:** http://www.cromosim.fr +- **Source code:** https://github.com/sylvain-faure/cromosim + The aim of this open source project is to make it possible to users to run simulations based from several models (cellular automata, microscopic simulations or using compartments), to test new configurations, and even to investigate the possibility to program their own model in complex geometry : do-it yourself ! This package proposes Python implementations of the numerical methods detailed in the book “Crowds in equations: an introduction to the microscopic modeling of crowds” by B. Maury (ENS Ulm & Univ. Paris-Sud) and S. Faure (CNRS), World Scientific 2018, Advanced textbooks in mathematics. -Github repository -================= - -Download the source code and the examples here: -https://github.com/sylvain-faure/cromosim/ How to use cromosim ? -===================== +--------------------- -First you have to install cromosim, either by using pip +First you have to install cromosim, either by using pip: - ~$ pip install cromosim + ~$ pip install cromosim -or by manually installing the package +or by manually installing the package: - cromosim$ python setup.py install + cromosim$ python setup.py install Once cromosim is installed, you can verify that it is possible to import it into Python: - ~$ python - Python 3.7.7 (default, Mar 10 2020, 15:43:33) - [Clang 11.0.0 (clang-1100.0.33.17)] on darwin - Type "help", "copyright", "credits" or "license" for more information. - >>> import cromosim - >>> print(cromosim.__version__) - 2.0.0 - >>> + ~$ python + Python 3.7.7 (default, Mar 10 2020, 15:43:33) + [Clang 11.0.0 (clang-1100.0.33.17)] on darwin + Type "help", "copyright", "credits" or "license" for more information. + >>> import cromosim + >>> print(cromosim.__version__) + 2.0.0 + >>> Now to make a first simulation, you can download one of the examples found in: -https://github.com/sylvain-faure/cromosim/tree/master/examples + https://github.com/sylvain-faure/cromosim/tree/master/examples or retrieve all the examples available using the following command (svn is the Subversion command): - ~$ svn export https://github.com/sylvain\-faure/cromosim/trunk/examples my-cromosim + ~$ svn export https://github.com/sylvain\-faure/cromosim/trunk/examples my-cromosim and then run a first example: - ~$ cd my-cromosim/micro/granular - granular$ python micro_granular.py --json input_room.json + ~$ cd my-cromosim/micro/granular + granular$ python micro_granular.py --json input_room.json These examples will allow you to start your own calculations. - -Documentation -============= - -http://www.cromosim.fr diff --git a/README.rst b/README.rst deleted file mode 100755 index c238cd7..0000000 --- a/README.rst +++ /dev/null @@ -1,77 +0,0 @@ -cromosim -======== - -CROMOSIM is a Python Library for Crowd Motion Simulation. - -The aim of this open source project is to make it possible to users to run -simulations based from several models (cellular automata, microscopic -simulations or using compartments), to test new configurations, and even -to investigate the possibility to program their own model in complex -geometry: do-it yourself ! - -This package proposes Python implementations of the numerical methods detailed -in the book “Crowds in equations: an introduction to the microscopic modeling -of crowds” by B. Maury (ENS Ulm & Univ. Paris-Saclay) and S. Faure (CNRS), World -Scientific 2018, Advanced textbooks in mathematics. - -Github repository -================= - -Download the source code and the examples here: - -https://github.com/sylvain-faure/cromosim/ - -How to use cromosim ? -===================== - -First you have to install cromosim, either by using pip - -.. code-block:: javascript - - ~$ pip install cromosim - -or by manually installing the package - -.. code-block:: python - - cromosim$ python setup.py install - -Once cromosim is installed, you can verify that it is possible to import it -into Python: - -.. code-block:: python - - ~$ python - Python 3.7.7 (default, Mar 10 2020, 15:43:33) - [Clang 11.0.0 (clang-1100.0.33.17)] on darwin - Type "help", "copyright", "credits" or "license" for more information. - >>> import cromosim - >>> print(cromosim.__version__) - 2.0.0 - >>> - -Now to make a first simulation, you can download one of the examples found in: - -https://github.com/sylvain-faure/cromosim/tree/master/examples - -or retrieve all the examples available using the following command (``svn`` -is the Subversion command): - -.. code-block:: python - - ~$ svn export https://github.com/sylvain\-faure/cromosim/trunk/examples my-cromosim - -and then run a first example: - -.. code-block:: python - - ~$ cd my-cromosim/micro/granular - granular$ python micro_granular.py --json input_room.json - -These examples will allow you to start your own calculations. - - -Documentation: -============== - -``_ diff --git a/cromosim/version.py b/cromosim/version.py index 206b3d2..929d160 100644 --- a/cromosim/version.py +++ b/cromosim/version.py @@ -1 +1 @@ -version = '2.0.0' \ No newline at end of file +version = '2.0.2' \ No newline at end of file diff --git a/doc/.DS_Store b/doc/.DS_Store new file mode 100644 index 0000000..2bd2e7a Binary files /dev/null and b/doc/.DS_Store differ diff --git a/doc/source/.DS_Store b/doc/source/.DS_Store new file mode 100644 index 0000000..149dcb0 Binary files /dev/null and b/doc/source/.DS_Store differ diff --git a/doc/source/_static/.DS_Store b/doc/source/_static/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/doc/source/_static/.DS_Store differ diff --git a/doc/source/_static/cellular_automata.theora.ogv b/doc/source/_static/cellular_automata.theora.ogv deleted file mode 100644 index 65f4f24..0000000 Binary files a/doc/source/_static/cellular_automata.theora.ogv and /dev/null differ diff --git a/doc/source/_static/cellular_automata.webm b/doc/source/_static/cellular_automata.webm deleted file mode 100644 index 6731d90..0000000 Binary files a/doc/source/_static/cellular_automata.webm and /dev/null differ diff --git a/doc/source/_static/compartments.theora.ogv b/doc/source/_static/compartments.theora.ogv deleted file mode 100644 index 9638a4e..0000000 Binary files a/doc/source/_static/compartments.theora.ogv and /dev/null differ diff --git a/doc/source/_static/compartments.webm b/doc/source/_static/compartments.webm deleted file mode 100644 index f1902a5..0000000 Binary files a/doc/source/_static/compartments.webm and /dev/null differ diff --git a/doc/source/_static/domain_manually_desired_velocity.png b/doc/source/_static/domain_manually_desired_velocity.png deleted file mode 100644 index 35baa44..0000000 Binary files a/doc/source/_static/domain_manually_desired_velocity.png and /dev/null differ diff --git a/doc/source/_static/domain_manually_wall_distance.png b/doc/source/_static/domain_manually_wall_distance.png deleted file mode 100644 index 050fb3e..0000000 Binary files a/doc/source/_static/domain_manually_wall_distance.png and /dev/null differ diff --git a/doc/source/_static/ftl_order1.theora.ogv b/doc/source/_static/ftl_order1.theora.ogv deleted file mode 100644 index bba60a8..0000000 Binary files a/doc/source/_static/ftl_order1.theora.ogv and /dev/null differ diff --git a/doc/source/_static/ftl_order1.webm b/doc/source/_static/ftl_order1.webm deleted file mode 100644 index 1cc730b..0000000 Binary files a/doc/source/_static/ftl_order1.webm and /dev/null differ diff --git a/doc/source/_static/ftl_order1_periodic.theora.ogv b/doc/source/_static/ftl_order1_periodic.theora.ogv deleted file mode 100644 index 5810155..0000000 Binary files a/doc/source/_static/ftl_order1_periodic.theora.ogv and /dev/null differ diff --git a/doc/source/_static/ftl_order1_periodic.webm b/doc/source/_static/ftl_order1_periodic.webm deleted file mode 100644 index 6c870ec..0000000 Binary files a/doc/source/_static/ftl_order1_periodic.webm and /dev/null differ diff --git a/doc/source/_static/ftl_order2.theora.ogv b/doc/source/_static/ftl_order2.theora.ogv deleted file mode 100644 index 71c1712..0000000 Binary files a/doc/source/_static/ftl_order2.theora.ogv and /dev/null differ diff --git a/doc/source/_static/ftl_order2.webm b/doc/source/_static/ftl_order2.webm deleted file mode 100644 index f704931..0000000 Binary files a/doc/source/_static/ftl_order2.webm and /dev/null differ diff --git a/doc/source/_static/ftl_order2_periodic.theora.ogv b/doc/source/_static/ftl_order2_periodic.theora.ogv deleted file mode 100644 index 4227473..0000000 Binary files a/doc/source/_static/ftl_order2_periodic.theora.ogv and /dev/null differ diff --git a/doc/source/_static/ftl_order2_periodic.webm b/doc/source/_static/ftl_order2_periodic.webm deleted file mode 100644 index 55d753d..0000000 Binary files a/doc/source/_static/ftl_order2_periodic.webm and /dev/null differ diff --git a/doc/source/_static/micro_granular.mp4 b/doc/source/_static/micro_granular.mp4 deleted file mode 100644 index f71d62e..0000000 Binary files a/doc/source/_static/micro_granular.mp4 and /dev/null differ diff --git a/doc/source/_static/micro_granular.png b/doc/source/_static/micro_granular.png deleted file mode 100644 index 4e005e2..0000000 Binary files a/doc/source/_static/micro_granular.png and /dev/null differ diff --git a/doc/source/_static/micro_granular.theora.ogv b/doc/source/_static/micro_granular.theora.ogv deleted file mode 100644 index b4c2509..0000000 Binary files a/doc/source/_static/micro_granular.theora.ogv and /dev/null differ diff --git a/doc/source/_static/micro_granular.webm b/doc/source/_static/micro_granular.webm deleted file mode 100644 index 8135951..0000000 Binary files a/doc/source/_static/micro_granular.webm and /dev/null differ diff --git a/doc/source/_static/micro_granular_event.mp4 b/doc/source/_static/micro_granular_event.mp4 index cdc96df..66f1422 100644 Binary files a/doc/source/_static/micro_granular_event.mp4 and b/doc/source/_static/micro_granular_event.mp4 differ diff --git a/doc/source/_static/micro_granular_event.oggtheora.ogv b/doc/source/_static/micro_granular_event.oggtheora.ogv deleted file mode 100644 index d96524f..0000000 Binary files a/doc/source/_static/micro_granular_event.oggtheora.ogv and /dev/null differ diff --git a/doc/source/_static/micro_granular_event.webmhd.webm b/doc/source/_static/micro_granular_event.webmhd.webm deleted file mode 100644 index 5ae0955..0000000 Binary files a/doc/source/_static/micro_granular_event.webmhd.webm and /dev/null differ diff --git a/doc/source/_static/micro_granular_room_paths.mp4 b/doc/source/_static/micro_granular_room_paths.mp4 index a1ba161..1cc0c6e 100644 Binary files a/doc/source/_static/micro_granular_room_paths.mp4 and b/doc/source/_static/micro_granular_room_paths.mp4 differ diff --git a/doc/source/_static/micro_granular_room_paths.oggtheora.ogv b/doc/source/_static/micro_granular_room_paths.oggtheora.ogv deleted file mode 100644 index 4a1fb60..0000000 Binary files a/doc/source/_static/micro_granular_room_paths.oggtheora.ogv and /dev/null differ diff --git a/doc/source/_static/micro_granular_room_paths.webmhd.webm b/doc/source/_static/micro_granular_room_paths.webmhd.webm deleted file mode 100644 index 9fc073a..0000000 Binary files a/doc/source/_static/micro_granular_room_paths.webmhd.webm and /dev/null differ diff --git a/doc/source/_static/micro_granular_shibuya_crossing.mp4 b/doc/source/_static/micro_granular_shibuya_crossing.mp4 index 33d94ae..84e4525 100644 Binary files a/doc/source/_static/micro_granular_shibuya_crossing.mp4 and b/doc/source/_static/micro_granular_shibuya_crossing.mp4 differ diff --git a/doc/source/_static/micro_granular_shibuya_crossing.oggtheora.ogv b/doc/source/_static/micro_granular_shibuya_crossing.oggtheora.ogv deleted file mode 100644 index 634fd2a..0000000 Binary files a/doc/source/_static/micro_granular_shibuya_crossing.oggtheora.ogv and /dev/null differ diff --git a/doc/source/_static/micro_granular_shibuya_crossing.png b/doc/source/_static/micro_granular_shibuya_crossing.png index fda04b3..d4d15d5 100644 Binary files a/doc/source/_static/micro_granular_shibuya_crossing.png and b/doc/source/_static/micro_granular_shibuya_crossing.png differ diff --git a/doc/source/_static/micro_granular_shibuya_crossing.webmhd.webm b/doc/source/_static/micro_granular_shibuya_crossing.webmhd.webm deleted file mode 100644 index 0710ba3..0000000 Binary files a/doc/source/_static/micro_granular_shibuya_crossing.webmhd.webm and /dev/null differ diff --git a/doc/source/_static/micro_granular_stadium.mp4 b/doc/source/_static/micro_granular_stadium.mp4 index e0d5631..82a2342 100644 Binary files a/doc/source/_static/micro_granular_stadium.mp4 and b/doc/source/_static/micro_granular_stadium.mp4 differ diff --git a/doc/source/_static/micro_granular_stadium.oggtheora.ogv b/doc/source/_static/micro_granular_stadium.oggtheora.ogv deleted file mode 100644 index 1c496f0..0000000 Binary files a/doc/source/_static/micro_granular_stadium.oggtheora.ogv and /dev/null differ diff --git a/doc/source/_static/micro_granular_stadium.png b/doc/source/_static/micro_granular_stadium.png index b226961..626a6b1 100644 Binary files a/doc/source/_static/micro_granular_stadium.png and b/doc/source/_static/micro_granular_stadium.png differ diff --git a/doc/source/_static/micro_granular_stadium.webmhd.webm b/doc/source/_static/micro_granular_stadium.webmhd.webm deleted file mode 100644 index c95ebdc..0000000 Binary files a/doc/source/_static/micro_granular_stadium.webmhd.webm and /dev/null differ diff --git a/doc/source/_static/micro_granular_stairs_0.mp4 b/doc/source/_static/micro_granular_stairs_0.mp4 deleted file mode 100644 index eccc483..0000000 Binary files a/doc/source/_static/micro_granular_stairs_0.mp4 and /dev/null differ diff --git a/doc/source/_static/micro_granular_stairs_0_1.mp4 b/doc/source/_static/micro_granular_stairs_0_1.mp4 index 75058c0..16d1435 100644 Binary files a/doc/source/_static/micro_granular_stairs_0_1.mp4 and b/doc/source/_static/micro_granular_stairs_0_1.mp4 differ diff --git a/doc/source/_static/micro_granular_stairs_0_1.oggtheora.ogv b/doc/source/_static/micro_granular_stairs_0_1.oggtheora.ogv deleted file mode 100644 index 37b8386..0000000 Binary files a/doc/source/_static/micro_granular_stairs_0_1.oggtheora.ogv and /dev/null differ diff --git a/doc/source/_static/micro_granular_stairs_0_1.webmhd.webm b/doc/source/_static/micro_granular_stairs_0_1.webmhd.webm deleted file mode 100644 index 3f88c31..0000000 Binary files a/doc/source/_static/micro_granular_stairs_0_1.webmhd.webm and /dev/null differ diff --git a/doc/source/_static/micro_granular_stairs_1.mp4 b/doc/source/_static/micro_granular_stairs_1.mp4 deleted file mode 100644 index 6df5d9f..0000000 Binary files a/doc/source/_static/micro_granular_stairs_1.mp4 and /dev/null differ diff --git a/doc/source/_static/micro_social.mp4 b/doc/source/_static/micro_social.mp4 deleted file mode 100644 index 52b24b6..0000000 Binary files a/doc/source/_static/micro_social.mp4 and /dev/null differ diff --git a/doc/source/_static/micro_social.theora.ogv b/doc/source/_static/micro_social.theora.ogv deleted file mode 100644 index ffb8b79..0000000 Binary files a/doc/source/_static/micro_social.theora.ogv and /dev/null differ diff --git a/doc/source/_static/micro_social.webm b/doc/source/_static/micro_social.webm deleted file mode 100644 index 4398844..0000000 Binary files a/doc/source/_static/micro_social.webm and /dev/null differ diff --git a/doc/source/_static/micro_social_event.mp4 b/doc/source/_static/micro_social_event.mp4 index 32dff45..64d3afc 100644 Binary files a/doc/source/_static/micro_social_event.mp4 and b/doc/source/_static/micro_social_event.mp4 differ diff --git a/doc/source/_static/micro_social_event.oggtheora.ogv b/doc/source/_static/micro_social_event.oggtheora.ogv deleted file mode 100644 index d49d6f5..0000000 Binary files a/doc/source/_static/micro_social_event.oggtheora.ogv and /dev/null differ diff --git a/doc/source/_static/micro_social_event.webmhd.webm b/doc/source/_static/micro_social_event.webmhd.webm deleted file mode 100644 index eadb712..0000000 Binary files a/doc/source/_static/micro_social_event.webmhd.webm and /dev/null differ diff --git a/doc/source/_static/micro_social_room_paths.mp4 b/doc/source/_static/micro_social_room_paths.mp4 index 4ad4e18..636f35a 100644 Binary files a/doc/source/_static/micro_social_room_paths.mp4 and b/doc/source/_static/micro_social_room_paths.mp4 differ diff --git a/doc/source/_static/micro_social_room_paths.oggtheora.ogv b/doc/source/_static/micro_social_room_paths.oggtheora.ogv deleted file mode 100644 index a667fab..0000000 Binary files a/doc/source/_static/micro_social_room_paths.oggtheora.ogv and /dev/null differ diff --git a/doc/source/_static/micro_social_room_paths.webmhd.webm b/doc/source/_static/micro_social_room_paths.webmhd.webm deleted file mode 100644 index 4687923..0000000 Binary files a/doc/source/_static/micro_social_room_paths.webmhd.webm and /dev/null differ diff --git a/doc/source/_static/micro_social_shibuya_crossing.mp4 b/doc/source/_static/micro_social_shibuya_crossing.mp4 index c818d9d..587ee22 100644 Binary files a/doc/source/_static/micro_social_shibuya_crossing.mp4 and b/doc/source/_static/micro_social_shibuya_crossing.mp4 differ diff --git a/doc/source/_static/micro_social_shibuya_crossing.oggtheora.ogv b/doc/source/_static/micro_social_shibuya_crossing.oggtheora.ogv deleted file mode 100644 index 85657ac..0000000 Binary files a/doc/source/_static/micro_social_shibuya_crossing.oggtheora.ogv and /dev/null differ diff --git a/doc/source/_static/micro_social_shibuya_crossing.png b/doc/source/_static/micro_social_shibuya_crossing.png index 4de7d74..5271cc2 100644 Binary files a/doc/source/_static/micro_social_shibuya_crossing.png and b/doc/source/_static/micro_social_shibuya_crossing.png differ diff --git a/doc/source/_static/micro_social_shibuya_crossing.webmhd.webm b/doc/source/_static/micro_social_shibuya_crossing.webmhd.webm deleted file mode 100644 index 99a91bc..0000000 Binary files a/doc/source/_static/micro_social_shibuya_crossing.webmhd.webm and /dev/null differ diff --git a/doc/source/_static/micro_social_stadium.mp4 b/doc/source/_static/micro_social_stadium.mp4 index 5c71b23..931d5a1 100644 Binary files a/doc/source/_static/micro_social_stadium.mp4 and b/doc/source/_static/micro_social_stadium.mp4 differ diff --git a/doc/source/_static/micro_social_stadium.oggtheora.ogv b/doc/source/_static/micro_social_stadium.oggtheora.ogv deleted file mode 100644 index 14db774..0000000 Binary files a/doc/source/_static/micro_social_stadium.oggtheora.ogv and /dev/null differ diff --git a/doc/source/_static/micro_social_stadium.png b/doc/source/_static/micro_social_stadium.png index b943b7c..1ef0da0 100644 Binary files a/doc/source/_static/micro_social_stadium.png and b/doc/source/_static/micro_social_stadium.png differ diff --git a/doc/source/_static/micro_social_stadium.webmhd.webm b/doc/source/_static/micro_social_stadium.webmhd.webm deleted file mode 100644 index 2ff6002..0000000 Binary files a/doc/source/_static/micro_social_stadium.webmhd.webm and /dev/null differ diff --git a/doc/source/_static/micro_social_stairs_0.mp4 b/doc/source/_static/micro_social_stairs_0.mp4 deleted file mode 100644 index fd5df05..0000000 Binary files a/doc/source/_static/micro_social_stairs_0.mp4 and /dev/null differ diff --git a/doc/source/_static/micro_social_stairs_0_1.mp4 b/doc/source/_static/micro_social_stairs_0_1.mp4 index 4f95921..d49aa26 100644 Binary files a/doc/source/_static/micro_social_stairs_0_1.mp4 and b/doc/source/_static/micro_social_stairs_0_1.mp4 differ diff --git a/doc/source/_static/micro_social_stairs_0_1.oggtheora.ogv b/doc/source/_static/micro_social_stairs_0_1.oggtheora.ogv deleted file mode 100644 index 30c9b5d..0000000 Binary files a/doc/source/_static/micro_social_stairs_0_1.oggtheora.ogv and /dev/null differ diff --git a/doc/source/_static/micro_social_stairs_0_1.webmhd.webm b/doc/source/_static/micro_social_stairs_0_1.webmhd.webm deleted file mode 100644 index fdec89e..0000000 Binary files a/doc/source/_static/micro_social_stairs_0_1.webmhd.webm and /dev/null differ diff --git a/doc/source/_static/micro_social_stairs_1.mp4 b/doc/source/_static/micro_social_stairs_1.mp4 deleted file mode 100644 index 3adf55f..0000000 Binary files a/doc/source/_static/micro_social_stairs_1.mp4 and /dev/null differ diff --git a/doc/source/_static/shibuya_crossing.png b/doc/source/_static/shibuya_crossing.png index 5d8b289..c9ada94 100644 Binary files a/doc/source/_static/shibuya_crossing.png and b/doc/source/_static/shibuya_crossing.png differ diff --git a/doc/source/example_ca.rst b/doc/source/example_ca.rst index 10c7363..4397f1f 100644 --- a/doc/source/example_ca.rst +++ b/doc/source/example_ca.rst @@ -31,8 +31,6 @@ Results:

diff --git a/doc/source/example_comp.rst b/doc/source/example_comp.rst index ef71671..62e9288 100644 --- a/doc/source/example_comp.rst +++ b/doc/source/example_comp.rst @@ -30,8 +30,6 @@ Results:

diff --git a/doc/source/example_ftl.rst b/doc/source/example_ftl.rst index f6016f4..c9f61d0 100644 --- a/doc/source/example_ftl.rst +++ b/doc/source/example_ftl.rst @@ -40,8 +40,6 @@ Results:

@@ -59,8 +57,6 @@ Results:

@@ -79,8 +75,6 @@ Results:

@@ -98,8 +92,6 @@ Results:

diff --git a/doc/source/example_micro.rst b/doc/source/example_micro.rst index 42ed79e..5b5cb3c 100644 --- a/doc/source/example_micro.rst +++ b/doc/source/example_micro.rst @@ -52,8 +52,6 @@ and can be launched with
@@ -73,8 +71,6 @@ and can be launched with
@@ -99,8 +95,6 @@ and can be launched with
@@ -125,8 +119,6 @@ and can be launched with
@@ -147,8 +139,6 @@ and can be launched with
@@ -207,8 +197,6 @@ and can be launched with
@@ -228,8 +216,6 @@ and can be launched with
@@ -254,8 +240,6 @@ and can be launched with
@@ -280,8 +264,6 @@ and can be launched with
@@ -302,8 +284,6 @@ and can be launched with
diff --git a/doc/tt b/doc/tt new file mode 100644 index 0000000..a04a66f --- /dev/null +++ b/doc/tt @@ -0,0 +1,48 @@ +Sphinx v3.0.1 en cours d'exécution +chargement de l'environnement pickled... fait +construction en cours [mo]:cibles pour les fichiers po 0 qui sont périmées +construction [html]:cibles pour les fichiers sources 1 qui sont périmées +mise-à-jour de l'environnement :[la configuration a changé ('numpydoc_xref_aliases')] 11 ajouté, 0 modifié, 0 supprimé +lecture des sources... [ 9%] ca +lecture des sources... [ 18%] comp +lecture des sources... [ 27%] domain +lecture des sources... [ 36%] example_ca +lecture des sources... [ 45%] example_comp +lecture des sources... [ 54%] example_dom +lecture des sources... [ 63%] example_ftl +lecture des sources... [ 72%] example_micro +lecture des sources... [ 81%] ftl +lecture des sources... [ 90%] index +lecture des sources... [100%] micro + +recherche des fichiers périmés... aucun résultat +environnement de sérialisation... fait +vérification de la cohérence... fait +document en préparation... fait +écriture... [ 9%] ca +écriture... [ 18%] comp +écriture... [ 27%] domain +écriture... [ 36%] example_ca +écriture... [ 45%] example_comp +écriture... [ 54%] example_dom +écriture... [ 63%] example_ftl +écriture... [ 72%] example_micro +écriture... [ 81%] ftl +écriture... [ 90%] index +écriture... [100%] micro + +generating indices... genindex py-modindexfait +coloration syntaxique du code du module...[ 20%] cromosim.ca +coloration syntaxique du code du module...[ 40%] cromosim.comp +coloration syntaxique du code du module...[ 60%] cromosim.domain +coloration syntaxique du code du module...[ 80%] cromosim.ftl +coloration syntaxique du code du module...[100%] cromosim.micro + +writing additional pages... searchfait +copie des fichiers statiques... ... fait +copying extra files... fait +dumping search index in English (code: en)... fait +dumping object inventory... fait +build a réussi, 13 warnings. + +Les pages HTML sont dans build/html . diff --git a/setup.py b/setup.py index e52e42a..01e8ea0 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ from setuptools import setup, find_packages +import os CLASSIFIERS = [ "Development Status :: 5 - Production/Stable", @@ -19,7 +20,7 @@ MAJOR = "2" MINOR = "0" -PATCH = "0" +PATCH = "2" VERSION = "{0}.{1}.{2}".format(MAJOR, MINOR, PATCH) def write_version_py(filename='cromosim/version.py'): @@ -29,16 +30,24 @@ def write_version_py(filename='cromosim/version.py'): finally: a.close() -README = open("README.rst").readlines() +# read the contents of your README file +from os import path +this_directory = path.abspath(path.dirname(__file__)) +with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f: + long_description = f.read() + +#README = open("README.rst").readlines() write_version_py() setup( name = "cromosim", version = VERSION, - description = README[0], - long_description_content_type = 'text/x-rst', - long_description = "".join(README[1:]), + #description = README[0], + #long_description_content_type = 'text/x-rst', + #long_description = "".join(README[1:]), + long_description=long_description, + long_description_content_type='text/markdown', author = "Sylvain Faure, Bertrand Maury", author_email = "sylvain.faure@math.u-psud.fr, bertrand.maury@math.u-psud.fr", url = "http://www.cromosim.fr",