Merge branch 'release_2.87.0' into release

.gitignore

@@ -31,3 +31,4 @@ source/jormungandr/jormungandr/_version.py
 .cache
 *.gcov
 .mypy_cache
+.pytest_cache

.mergify.yml

@@ -0,0 +1,31 @@
+pull_request_rules:
+  - name: automatic merge when CI passes and 2 reviews
+    conditions:
+      - "#approved-reviews-by>=2"
+      - "#review-requested=0"
+      - "#changes-requested-reviews-by=0"
+      - "#commented-reviews-by=0"
+      - status-success=continuous-integration/travis-ci/pr
+      - status-success=default
+      - status-success=codecov/project
+      - status-success=codecov/patch
+      - base=dev
+      - label!=dot_not_merge
+      - label!=wip
+      - label!=waiting
+      - label!=merge_after_release
+      - author=@coreteam
+    actions:
+      merge:
+        method: merge
+        strict: smart   # To avoid multiple builds at once on the CI
+        strict_method: rebase # We want Dev rebased onto the PR
+  - name: delete head branch after merge
+    conditions: []
+    actions:
+      delete_head_branch: {}
+  - name: remove outdated reviews
+    conditions:
+      - base=master
+    actions:
+      dismiss_reviews: {}

.pre-commit-config.yaml

@@ -11,6 +11,7 @@ repos:
         exclude: ^source/tests/chaos/chaos_loading.sql # Otherwise, Sql commands get corrupted
     -   id: check-ast
     -   id: check-merge-conflict
+    -   id: check-yaml
     -   id: flake8
         language_version: python2.7
 -   repo: https://github.com/CanalTP/navitia-pre-commit

.travis.yml

@@ -14,6 +14,8 @@ addons:
     packages:
     - clang-format-6.0
     - rabbitmq-server
+    - jq
+    - curl
 
 services:
   - docker
@@ -47,5 +49,7 @@ matrix:
         - bash source/scripts/build_protobuf.sh
       script:
         - pre-commit run --all --show-diff-on-failure
+        - ./source/scripts/checkJenkinsJob.sh Artemis
+        - ./source/scripts/checkJenkinsJob.sh Artemis_idfm
   exclude:
     - python: "3.6"

debian/changelog

@@ -1,3 +1,26 @@
+navitia2 (2.87.0) unstable; urgency=low
+
+  * Jormun: Hide Tags=[] option for /line_reports and /trafic_reports  <https://github.com/CanalTP/navitia/pull/2998>
+  * Jormun: Add type annotation on traveler_profile  <https://github.com/CanalTP/navitia/pull/2990>
+  * Jormun: Remove excess tickets and ticket links inside response  <https://github.com/CanalTP/navitia/pull/2982>
+  * Ed: use fare_zone_id instead of zone_id in fusio_parser  <https://github.com/CanalTP/navitia/pull/2994>
+  * [Kraken] fix count in places_nearby  <https://github.com/CanalTP/navitia/pull/2993>
+  * [Kraken] Update metadatas for /status requests  <https://github.com/CanalTP/navitia/pull/2992>
+  * Jormun: log response from bragi that aren't json  <https://github.com/CanalTP/navitia/pull/2971>
+  * Handle disruption with multiple stop_points in same area / repeated stop_points  <https://github.com/CanalTP/navitia/pull/2959>
+  * [Jormun]: Adding max_nb_crowfly_by_mode in status  <https://github.com/CanalTP/navitia/pull/2987>
+  * [Eitri] Fix cities file type  <https://github.com/CanalTP/navitia/pull/2980>
+  * [Jormungandr] Update comfort criteria  <https://github.com/CanalTP/navitia/pull/2988>
+  * [Jormungandr] use best PT journey for too_many_connections_filter  <https://github.com/CanalTP/navitia/pull/2977>
+  * Artemis and Artemis_idfm as requirements  <https://github.com/CanalTP/navitia/pull/2984>
+  * [Jormun] Adding max_mode_direct_path_duration in /status and /instances  <https://github.com/CanalTP/navitia/pull/2968>
+  * Minor edit - .gitignore update  <https://github.com/CanalTP/navitia/pull/2976>
+  * [Tyr] New endpoints in API v1  <https://github.com/CanalTP/navitia/pull/2951>
+  * utils: replace in() function by contains() to standardize  <https://github.com/CanalTP/navitia/pull/2965>
+  * jormun: add direction_type parameter for departures/arrivals/stop_schedules/route_schedules Api  <https://github.com/CanalTP/navitia/pull/2967>
+
+ -- krishna <[email protected]>  Fri, 11 Oct 2019 11:10:25 +0100
+
 navitia2 (2.86.0) unstable; urgency=low
 
   * Osm2ed: do not put transport object from OSM in autocompletion  <https://github.com/CanalTP/navitia/pull/2961>

documentation/rfc/ptref_grammar.md

@@ -82,7 +82,7 @@ In the following table, if the invocation starts with `collection`, any collecti
 |`poi.within(distance, coord)`|all the POIs within `distance` meters from `coord`|`distance` in a positive integer, `coord` is a navitia coord (`lon;lat`)|
 |`stop_area.within(distance, coord)`|as above for the stop areas|as above|
 |`stop_point.within(distance, coord)`|as above for the stop points|as above|
-|`route.has_direction_type(type1, type2, ...)`|all the `route` containing a given `direction_type` into list|at least one direction type must be given|
+|`route.has_direction_type(type1, type2, ...)`|all the routes whose `direction_type` is any of those provided|at least one direction type must be given|
 
 #### Interpretation
 

documentation/slate/source/includes/apis.md

@@ -1438,15 +1438,16 @@ access it via that kind of url: <https://api.navitia.io/v1/{a_path_to_a_resource
 
 ### Parameters
 
-Required | Name               | Type      | Description                                                                              | Default Value
----------|--------------------|-----------|------------------------------------------------------------------------------------------|--------------
-nop      | from_datetime      | [iso-date-time](#iso-date-time) | The date_time from which you want the schedules                    | the current datetime
-nop      | duration           | int       | Maximum duration in seconds between from_datetime and the retrieved datetimes.           | 86400
-nop      | depth              | int       | Json response [depth](#depth)                                                            | 1
-nop      | items_per_schedule | int       | Maximum number of columns per schedule.                                                  |
-nop      | forbidden_uris[]   | id        | If you want to avoid lines, modes, networks, etc.                                        |
-nop      | data_freshness     | enum      | Define the freshness of data to use<br><ul><li>realtime</li><li>base_schedule</li></ul>  | base_schedule
-nop      | disable_geojson    | boolean   | remove geojson fields from the response                                                  | False
+Required | Name               | Type      | Description                                                                                                                | Default Value
+---------|--------------------|-----------|----------------------------------------------------------------------------------------------------------------------------|--------------
+nop      | from_datetime      | [iso-date-time](#iso-date-time) | The date_time from which you want the schedules                                                      | the current datetime
+nop      | duration           | int       | Maximum duration in seconds between from_datetime and the retrieved datetimes.                                             | 86400
+nop      | depth              | int       | Json response [depth](#depth)                                                                                              | 1
+nop      | items_per_schedule | int       | Maximum number of columns per schedule.                                                                                    |
+nop      | forbidden_uris[]   | id        | If you want to avoid lines, modes, networks, etc.                                                                          |
+nop      | data_freshness     | enum      | Define the freshness of data to use<br><ul><li>realtime</li><li>base_schedule</li></ul>                                    | base_schedule
+nop      | disable_geojson    | boolean   | remove geojson fields from the response                                                                                    | False
+nop      | direction_type     | enum      | Allow to filter the response with the route direction type property <ul><li>all</li><li>forward</li><li>backward</li></ul>Note: forward is equivalent to clockwise and inbound. When you select forward, you filter with: [forward, clockwise, inbound].<br>backward is equivalent to anticlockwise and outbound. when you select backward, you filter with: [backward, anticlockwise, outbound] | all
 
 ### Objects
 
@@ -1571,15 +1572,16 @@ See how disruptions affect stop schedules in the [real time](#realtime) section.
 
 ### Parameters
 
-Required | Name               | Type                            | Description        | Default Value
----------|--------------------|---------------------------------|--------------------|--------------
-nop      | from_datetime      | [iso-date-time](#iso-date-time) | The date_time from which you want the schedules | the current datetime
-nop      | duration           | int                             | Maximum duration in seconds between from_datetime and the retrieved datetimes.                            | 86400
-nop      | depth              | int                             | Json response [depth](#depth) | 1
-nop      | forbidden_uris[]   | id                              | If you want to avoid lines, modes, networks, etc.    |
-nop      | items_per_schedule | int                             | Maximum number of datetimes per schedule.                                                  |
-nop      | data_freshness     | enum                            | Define the freshness of data to use to compute journeys <ul><li>realtime</li><li>base_schedule</li></ul> | realtime
-nop      | disable_geojson    | boolean                         | remove geojson fields from the response | False
+Required | Name               | Type                            | Description                                                                                                                | Default Value
+---------|--------------------|---------------------------------|----------------------------------------------------------------------------------------------------------------------------|--------------
+nop      | from_datetime      | [iso-date-time](#iso-date-time) | The date_time from which you want the schedules                                                                            | the current datetime
+nop      | duration           | int                             | Maximum duration in seconds between from_datetime and the retrieved datetimes.                                             | 86400
+nop      | depth              | int                             | Json response [depth](#depth)                                                                                              | 1
+nop      | forbidden_uris[]   | id                              | If you want to avoid lines, modes, networks, etc.                                                                          |
+nop      | items_per_schedule | int                             | Maximum number of datetimes per schedule.                                                                                  |
+nop      | data_freshness     | enum                            | Define the freshness of data to use to compute journeys <ul><li>realtime</li><li>base_schedule</li></ul>                   | realtime
+nop      | disable_geojson    | boolean                         | remove geojson fields from the response                                                                                    | False
+nop      | direction_type     | enum                            | Allow to filter the response with the route direction type property <ul><li>all</li><li>forward</li><li>backward</li></ul>Note: forward is equivalent to clockwise and inbound. When you select forward, you filter with: [forward, clockwise, inbound].<br>backward is equivalent to anticlockwise and outbound. When you select backward, you filter with: [backward, anticlockwise, outbound] | all
 
 
 ### <a name="stop-schedule"></a>Stop_schedule object
@@ -1672,15 +1674,16 @@ See how disruptions affect the next departures in the [real time](#realtime) sec
 
 ### Parameters
 
-Required | Name             | Type                            | Description                                                                                              | Default Value
----------|------------------|---------------------------------|----------------------------------------------------------------------------------------------------------|--------------
-nop      | from_datetime    | [iso-date-time](#iso-date-time) | The date_time from which you want the schedules                                                          | the current datetime
-nop      | duration         | int                             | Maximum duration in seconds between from_datetime and the retrieved datetimes.                           | 86400
-nop      | count            | int                             | Maximum number of results.                                                                               | 10
-nop      | depth            | int                             | Json response [depth](#depth)                                                                            | 1
-nop      | forbidden_uris[] | id                              | If you want to avoid lines, modes, networks, etc.                                                        |
-nop      | data_freshness   | enum                            | Define the freshness of data to use to compute journeys <ul><li>realtime</li><li>base_schedule</li></ul> | realtime
-nop      | disable_geojson  | boolean                         | remove geojson fields from the response                                                                  | false
+Required | Name             | Type                            | Description                                                                                                                           | Default Value
+---------|------------------|---------------------------------|---------------------------------------------------------------------------------------------------------------------------------------|--------------
+nop      | from_datetime    | [iso-date-time](#iso-date-time) | The date_time from which you want the schedules                                                                                       | the current datetime
+nop      | duration         | int                             | Maximum duration in seconds between from_datetime and the retrieved datetimes.                                                        | 86400
+nop      | count            | int                             | Maximum number of results.                                                                                                            | 10
+nop      | depth            | int                             | Json response [depth](#depth)                                                                                                         | 1
+nop      | forbidden_uris[] | id                              | If you want to avoid lines, modes, networks, etc.                                                                                     |
+nop      | data_freshness   | enum                            | Define the freshness of data to use to compute journeys <ul><li>realtime</li><li>base_schedule</li></ul>                              | realtime
+nop      | disable_geojson  | boolean                         | remove geojson fields from the response                                                                                               | false
+nop      | direction_type   | enum                            | Allow to filter the response with the route direction type property <ul><li>all</li><li>forward</li><li>backward</li></ul>Note: forward is equivalent to clockwise and inbound. When you select forward, you filter with: [forward, clockwise, inbound].<br>backward is equivalent to anticlockwise and outbound. When you select backward, you filter with: [backward, anticlockwise, outbound] | all
 
 
 ### Departure objects
@@ -1808,7 +1811,6 @@ no       | count            | int                             | Maximum number o
 no       | depth            | int                             | Json response [depth](#depth)                     | 1
 no       | forbidden_uris[] | id                              | If you want to avoid lines, modes, networks, etc. |
 no       | disable_geojson  | boolean                         | remove geojson fields from the response           | false
-no       | tags[]           | array of string                 | Filter disruptions with the given tags            |
 
 The response is made of an array of [line_reports](#line-reports),
 and another one of [disruptions](#disruption).
@@ -1964,12 +1966,8 @@ For example:
 
 -   overall public transport traffic report on Ile de France coverage
     -   <https://api.navitia.io/v1/coverage/fr-idf/traffic_reports>
--   overall public transport traffic report on Ile de France coverage with disruptions having tags passed in parameter values
-    -   <https://api.navitia.io/v1/coverage/fr-idf/traffic_reports?tags[]=incident&tags[]=alert>
 -   Is there any perturbations on the RER network ?
     -   <https://api.navitia.io/v1/coverage/fr-idf/networks/network:RER/traffic_reports>
--   Is there any perturbations on the RER network with disruptions having tags passed in parameter values ?
-    -   <https://api.navitia.io/v1/coverage/fr-idf/networks/network:RER/traffic_reports?tags[]=incident&tags[]=alert>
 -   Is there any perturbations on the "RER A" line ?
     -   <https://api.navitia.io/v1/coverage/fr-idf/networks/network:RER/lines/line:OIF:810:AOIF741/line_reports?>
 
@@ -1981,7 +1979,6 @@ no       | count            | int                             | Maximum number o
 no       | depth            | int                             | Json response [depth](#depth)                       | 1
 no       | forbidden_uris[] | id                              | If you want to avoid lines, modes, networks, etc.   |
 no       | disable_geojson  | boolean                         | remove geojson fields from the response             | false
-no       | tags[]           | array of string                 | Filter disruptions with the given tags              |
 
 The response is made of an array of [traffic_reports](#traffic-reports),
 and another one of [disruptions](#disruption).

fixtures/ed/ntfs/stops.txt

@@ -1,4 +1,4 @@
-stop_id,visible,stop_name,stop_lat,stop_lon,zone_id,location_type,parent_station,stop_timezone,property_id,contributor_id,geometry_id
+stop_id,visible,stop_name,stop_lat,stop_lon,fare_zone_id,location_type,parent_station,stop_timezone,property_id,contributor_id,geometry_id
 SA:A,1,"Arrêt A",45.0296,0.5881,,1,,,,,
 SA:B,1,"Arrêt B",45.0245,0.5725,,1,,,,,
 SA:C,1,"Arrêt C",45.0211,0.5469,,1,,,,,

fixtures/ed/ntfs_v5/stops.txt

@@ -3,7 +3,7 @@ SA:A,1,"Arrêt A",45.0296,0.5881,,1,,,,,
 SA:B,1,"Arrêt B",45.0245,0.5725,,1,,,,,
 SA:C,1,"Arrêt C",45.0211,0.5469,,1,,,,,
 SA:D,1,"Arrêt D",44.9518,0.4572,,1,,,,,
-SP:A,1,"Arrêt A",45.0296,0.5881,,0,SA:A,,EQ1,,
+SP:A,1,"Arrêt A",45.0296,0.5881,4,0,SA:A,,EQ1,,
 SP:B,1,"Arrêt B",45.0245,0.5725,,0,SA:B,,,,
 SP:C,1,"Arrêt C",45.0211,0.5469,,0,SA:C,,,,
 24034,1,"Beleymas",44.993469,0.504929,,2,,,,,ADMIN:24034

readme.rst

@@ -70,7 +70,7 @@ More information
 * technical documentation https://github.com/CanalTP/navitia/tree/dev/documentation/rfc
 * twitter @navitia https://twitter.com/navitia
 * google groups navitia https://groups.google.com/d/forum/navitia
-* channel `#navitia` on irc.freenode.net
+* channel `#navitia` on matrix/riot https://riot.im/app/#/room/%23navitia:matrix.org
 
 
 Getting started

release/script_release.py

@@ -24,7 +24,7 @@
 #
 # Stay tuned using
 # twitter @navitia
-# IRC #navitia on freenode
+# channel `#navitia` on riot https://riot.im/app/#/room/#navitia:matrix.org
 # https://groups.google.com/d/forum/navitia
 # www.navitia.io
 from __future__ import absolute_import, print_function, division
@@ -77,7 +77,7 @@ def __init__(self, release_type, remote_name="canalTP"):
 
         print("checking that release was merged into dev...")
         unmerged = self.git.branch("--no-merged", "dev", '--no-color')
-        is_release_unmerged = re.search("  release(\n|$)", unmerged)
+        is_release_unmerged = re.search(" release(\n|$)", unmerged)
         if is_release_unmerged:
             print(is_release_unmerged.group(0))
             print("ABORTING: {rem}/release branch was not merged in {rem}/dev".format(rem=remote_name))