Skip to content

Commit 4c38ea7

Browse files
authored
Merge branch 'main' into dependabot/bundler/just-the-docs-0.10.1
2 parents fbf46de + 6ba76ce commit 4c38ea7

File tree

4 files changed

+19
-33
lines changed

4 files changed

+19
-33
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem "jekyll", "~> 4.3.4" # installed by `gem jekyll`
3+
gem "jekyll", "~> 4.4.1" # installed by `gem jekyll`
44
# gem "webrick" # required when using Ruby >= 3 and Jekyll <= 4.2.2
55

66
gem "just-the-docs", "0.10.1" # pinned to the current release

Gemfile.lock

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,41 @@ GEM
33
specs:
44
addressable (2.8.7)
55
public_suffix (>= 2.0.2, < 7.0)
6+
base64 (0.2.0)
67
bigdecimal (3.1.9)
78
colorator (1.1.0)
8-
concurrent-ruby (1.3.4)
9+
concurrent-ruby (1.3.5)
10+
csv (3.3.2)
911
em-websocket (0.5.3)
1012
eventmachine (>= 0.12.9)
1113
http_parser.rb (~> 0)
1214
eventmachine (1.2.7)
1315
ffi (1.17.1-arm64-darwin)
1416
ffi (1.17.1-x86_64-linux-gnu)
1517
forwardable-extended (2.6.0)
16-
google-protobuf (4.29.2-arm64-darwin)
18+
google-protobuf (4.29.3-arm64-darwin)
1719
bigdecimal
1820
rake (>= 13)
19-
google-protobuf (4.29.2-x86_64-linux)
21+
google-protobuf (4.29.3-x86_64-linux)
2022
bigdecimal
2123
rake (>= 13)
2224
http_parser.rb (0.8.0)
23-
i18n (1.14.6)
25+
i18n (1.14.7)
2426
concurrent-ruby (~> 1.0)
25-
jekyll (4.3.4)
27+
jekyll (4.4.1)
2628
addressable (~> 2.4)
29+
base64 (~> 0.2)
2730
colorator (~> 1.0)
31+
csv (~> 3.0)
2832
em-websocket (~> 0.5)
2933
i18n (~> 1.0)
3034
jekyll-sass-converter (>= 2.0, < 4.0)
3135
jekyll-watch (~> 2.0)
36+
json (~> 2.6)
3237
kramdown (~> 2.3, >= 2.3.1)
3338
kramdown-parser-gfm (~> 1.0)
3439
liquid (~> 4.0)
35-
mercenary (>= 0.3.6, < 0.5)
40+
mercenary (~> 0.3, >= 0.3.6)
3641
pathutil (~> 0.9)
3742
rouge (>= 3.0, < 5.0)
3843
safe_yaml (~> 1.0)
@@ -49,6 +54,7 @@ GEM
4954
jekyll-watch (2.2.1)
5055
listen (~> 3.0)
5156
just-the-docs (0.10.1)
57+
json (2.9.1)
5258
jekyll (>= 3.8.5)
5359
jekyll-include-cache
5460
jekyll-seo-tag (>= 2.0)
@@ -72,9 +78,9 @@ GEM
7278
rexml (3.4.0)
7379
rouge (4.5.1)
7480
safe_yaml (1.0.5)
75-
sass-embedded (1.83.1-arm64-darwin)
81+
sass-embedded (1.83.4-arm64-darwin)
7682
google-protobuf (~> 4.29)
77-
sass-embedded (1.83.1-x86_64-linux-gnu)
83+
sass-embedded (1.83.4-x86_64-linux-gnu)
7884
google-protobuf (~> 4.29)
7985
terminal-table (3.0.2)
8086
unicode-display_width (>= 1.1.1, < 3)
@@ -86,7 +92,7 @@ PLATFORMS
8692
x86_64-linux
8793

8894
DEPENDENCIES
89-
jekyll (~> 4.3.4)
95+
jekyll (~> 4.4.1)
9096
jekyll-relative-links (= 0.7.0)
9197
just-the-docs (= 0.10.1)
9298

extractors/fleetcomplete.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ Use the `docker-compose-extractor.yaml` file and define the functions you want t
2222
| set-roundtrips | loads, aggregate and save roundtrips |
2323
| clean-roundtrips | deletes X (keep_data in DB) month old roundtrips |
2424

25-
25+
The FleetComplete extractor has on the `set-vehicles` method, an additional `--exempt-locations` flag,
26+
which is set in the occasion that one wants to opt out on relying on location updates from the
27+
FleetComplete api.
2628

2729
```
2830
entrypoint: ["/bin/sh", "-c", "python -m fleetmanager.extractors.fleetcomplete set-starts && python -m fleetmanager.extractors.fleetcomplete set-vehicles && python -m fleetmanager.extractors.fleetcomplete set-roundtrips && python -m fleetmanager.extractors.fleetcomplete clean-roundtrips"]

0 commit comments

Comments
 (0)