Skip to content

Commit 59fd488

Browse files
henryiiihenryiii
committed
fix: remove baseurl (Jekyll 4 adds it)
Signed-off-by: Henry Schreiner <[email protected]>
1 parent cb53f07 commit 59fd488

16 files changed

+73
-54
lines changed

‎Gemfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
source 'https://rubygems.org'
44

5+
ruby '>= 3.1'
6+
57
# Hello! This is where you manage which Jekyll version is used to run.
68
# When you want to use a different version, change it below, save the
79
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
@@ -20,12 +22,18 @@ gem 'kramdown-parser-gfm'
2022
# gem 'just-the-docs'
2123
gem 'rake'
2224

25+
# Used to be in the stdlib
26+
gem 'logger'
27+
28+
# This is the theme
29+
gem "just-the-docs"
30+
2331
# If you have any plugins, put them here!
2432
group :jekyll_plugins do
2533
gem 'jekyll-feed'
2634
gem 'jekyll-redirect-from'
27-
gem 'jekyll-remote-theme'
2835
gem 'jekyll-seo-tag'
36+
gem 'jekyll-sass-converter', '~> 3.1.0'
2937
end
3038

3139
# Checkers and such

‎Gemfile.lock

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,20 +89,22 @@ GEM
8989
webrick (~> 1.7)
9090
jekyll-feed (0.17.0)
9191
jekyll (>= 3.7, < 5.0)
92+
jekyll-include-cache (0.2.1)
93+
jekyll (>= 3.7, < 5.0)
9294
jekyll-redirect-from (0.16.0)
9395
jekyll (>= 3.3, < 5.0)
94-
jekyll-remote-theme (0.4.3)
95-
addressable (~> 2.0)
96-
jekyll (>= 3.5, < 5.0)
97-
jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
98-
rubyzip (>= 1.3.0, < 3.0)
99-
jekyll-sass-converter (3.0.0)
100-
sass-embedded (~> 1.54)
96+
jekyll-sass-converter (3.1.0)
97+
sass-embedded (~> 1.75)
10198
jekyll-seo-tag (2.8.0)
10299
jekyll (>= 3.8, < 5.0)
103100
jekyll-watch (2.2.1)
104101
listen (~> 3.0)
105102
json (2.9.1)
103+
just-the-docs (0.10.1)
104+
jekyll (>= 3.8.5)
105+
jekyll-include-cache
106+
jekyll-seo-tag (>= 2.0)
107+
rake (>= 12.3.1)
106108
kramdown (2.5.1)
107109
rexml (>= 3.3.9)
108110
kramdown-parser-gfm (1.1.0)
@@ -111,6 +113,7 @@ GEM
111113
listen (3.9.0)
112114
rb-fsevent (~> 0.10, >= 0.10.3)
113115
rb-inotify (~> 0.9, >= 0.9.10)
116+
logger (1.6.4)
114117
mercenary (0.4.0)
115118
metrics (0.12.1)
116119
nokogiri (1.18.2-aarch64-linux-gnu)
@@ -147,7 +150,6 @@ GEM
147150
rexml (3.4.0)
148151
rouge (4.5.1)
149152
ruby-rc4 (0.1.5)
150-
rubyzip (2.4.1)
151153
safe_yaml (1.0.5)
152154
sass-embedded (1.83.4-aarch64-linux-gnu)
153155
google-protobuf (~> 4.29)
@@ -196,12 +198,17 @@ DEPENDENCIES
196198
jekyll
197199
jekyll-feed
198200
jekyll-redirect-from
199-
jekyll-remote-theme
201+
jekyll-sass-converter (~> 3.1.0)
200202
jekyll-seo-tag
203+
just-the-docs
201204
kramdown-parser-gfm
205+
logger
202206
rake
203207
tzinfo-data
204208
webrick
205209

210+
RUBY VERSION
211+
ruby 3.4.1p0
212+
206213
BUNDLED WITH
207214
2.6.2

‎_config.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ description: >-
88
github_username: scikit-hep
99
# Build settings
1010
markdown: kramdown
11-
# Local: theme: "just-the-docs"
12-
remote_theme: "just-the-docs/[email protected]"
11+
theme: "just-the-docs"
1312
plugins:
1413
- jekyll-feed
1514

@@ -57,3 +56,8 @@ callouts:
5756
title: Important
5857
highlight:
5958
color: blue
59+
60+
# SASS 3 will make stuff break
61+
sass:
62+
quiet_deps: true # https://github.com/just-the-docs/just-the-docs/issues/1541
63+
silence_deprecations: ['import'] # https://github.com/just-the-docs/just-the-docs/issues/1607

‎_includes/package_table.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h3 id="{{cat.name}}">{{cat.title}}:</h3>
1515
<a href="{{project.url}}" class="logo">
1616
<img
1717
style="{{ project.projlogo-style | default: 'height:48px;'}}"
18-
src="{{site.baseurl}}{{ project.projlogo | link }}"
18+
src="{{ project.projlogo | link }}"
1919
alt="{{project.name}} logo"
2020
/>
2121
</a>

‎index.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ nav_order: 1
88

99
The Scikit-HEP project is a community-driven and community-oriented project
1010
with the aim of providing Particle Physics at large with an ecosystem for data
11-
analysis in Python. [Read more →]({{site.baseurl}}{% link pages/about/index.md %})
11+
analysis in Python. [Read more →]({% link pages/about/index.md %})
1212

1313
New users can start with our
14-
[user pages]({{site.baseurl}}{% link pages/user/index.md %}). See our
15-
[developer pages]({{site.baseurl}}{% link pages/developers/index.md %})
14+
[user pages]({% link pages/user/index.md %}). See our
15+
[developer pages]({% link pages/developers/index.md %})
1616
for information on developing Python packages.
1717

1818
<div markdown="1" class="text-center text-delta fs-3">
19-
[News]({{site.baseurl}}{% link pages/news.md %}) •
19+
[News]({% link pages/news.md %}) •
2020
[Tutorial](https://hsf-training.github.io/hsf-training-scikit-hep-webpage/) •
21-
[Resources]({{site.baseurl}}{% link pages/user/resources.md %}) •
22-
[Cite us]({{site.baseurl}}{% link pages/about/citing.md %}) •
23-
[Get in touch]({{site.baseurl}}{% link pages/user/getting-in-touch.md %})
21+
[Resources]({% link pages/user/resources.md %}) •
22+
[Cite us]({% link pages/about/citing.md %}) •
23+
[Get in touch]({% link pages/user/getting-in-touch.md %})
2424
</div>
2525

2626
{% include package_table.html %}
@@ -34,4 +34,4 @@ stack. If you are looking for a deprecated package, see the [full package list][
3434
[gitter-skhep-link]: https://gitter.im/Scikit-HEP/community
3535
[gitter-skhep-badge]: https://badges.gitter.im/Scikit-HEP/community.svg
3636

37-
[full package list]: {{site.baseurl}}{% link pages/packages/index.md %}
37+
[full package list]: {% link pages/packages/index.md %}

‎pages/about/funding.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ provide funding for Eduardo Rodrigues (2020-) to work on this project part-time.
3434
[oac-1450377]: https://nsf.gov/awardsearch/showAward?AWD_ID=1450377
3535
[oac-1836650]: https://nsf.gov/awardsearch/showAward?AWD_ID=1836650
3636

37-
[img-nsf]: {{ site.baseurl }}{% link /assets/images/funding/nsf-logo-128.png %}
37+
[img-nsf]: {% link /assets/images/funding/nsf-logo-128.png %}
3838
{: width="70px"}
39-
[img-stfc]: {{ site.baseurl }}{% link /assets/images/funding/UKRI_STF_Council-Logo_Horiz-RGB.png %}
39+
[img-stfc]: {% link /assets/images/funding/UKRI_STF_Council-Logo_Horiz-RGB.png %}
4040
{: width="140px"}
41-
[img-liverpool]: {{ site.baseurl }}{% link /assets/images/funding/university-liverpool-logo.png %}
41+
[img-liverpool]: {% link /assets/images/funding/university-liverpool-logo.png %}
4242
{: width="140px"}

‎pages/about/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ has_children: true
77
---
88

99
The Scikit-HEP project
10-
(HEP stands for High Energy Physics, see more in the [FAQ]({{site.baseurl}}{% link pages/about/faq.md %} ))
10+
(HEP stands for High Energy Physics, see more in the [FAQ]({% link pages/about/faq.md %} ))
1111
is a community-driven and
1212
community-oriented project with the aim of providing Particle Physics at
1313
large with an ecosystem for data analysis in Python. The project started

‎pages/developers/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ simplify tasks and help new contributors.
5555
> your repository with the guidelines, runnable right in the guide via
5656
> WebAssembly! All checks point to a linked badge in the guide.
5757
58-
[guidelines]: {{ site.baseurl }}{% link pages/packages/guidelines.md %}
59-
[badges]: {{ site.baseurl }}{% link pages/developers/badges.md %}
58+
[guidelines]: {% link pages/packages/guidelines.md %}
59+
[badges]: {% link pages/developers/badges.md %}
6060
[intro]: https://learn.scientific-python.org/development/tutorials/dev-environment/
6161
[style]: https://learn.scientific-python.org/development/guides/style/
6262
[coverage]: https://learn.scientific-python.org/development/guides/coverage/

‎pages/packages/affiliated.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ In the following, projects that work closely together with Scikit-HEP are descri
1919

2020
---
2121

22-
[![{{project.name}} logo]({{site.baseurl}}{{ project.image | link }}){: style="{{ project.image-style | default: "height:64px;"}}"}]({{project.url}}){: .largelogo }
22+
[![{{project.name}} logo]({{ project.image | link }}){: style="{{ project.image-style | default: "height:64px;"}}"}]({{project.url}}){: .largelogo }
2323
{%- else -%}
2424

2525
---

‎pages/packages/guidelines.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ We highly recommend but do not require [Black][], which is supported by the
4141
Python Software Foundation and provides a consistent style across many
4242
different packages. For special cases, you can disable formatting for that
4343
line/section only. It is also recommended that you use pre-commit to control
44-
these checks with a standard interface. See [Style]({{ site.baseurl }}{% link
44+
these checks with a standard interface. See [Style]({% link
4545
pages/developers/style.md %}) for details.
4646

4747
### Tests and continuous integration (required)
4848

4949
A reasonable test suite is a requirement, and it is desirable to achieve high
5050
coverage. We require at least some tests, with [pytest][] being our recommended framework.
51-
You should run your tests in CI; see [our GitHub Actions (GHA) page]({{ site.baseurl }}{% link
51+
You should run your tests in CI; see [our GitHub Actions (GHA) page]({% link
5252
pages/developers/gha_basic.md %}) for a simple introduction to setting up CI.
5353

5454
### Packaging (required)
@@ -75,7 +75,7 @@ before release.
7575
Except in special circumstances, you must provide SDists and wheels on PyPI.
7676
This also means your package must be "installable", and therefore should be
7777
using a [PEP 517][] compliant packaging framework. Since many Scikit-HEP packages
78-
have [a binary component]({{ site.baseurl }}{% link
78+
have [a binary component]({% link
7979
pages/developers/gha_wheels.md %}), we recommend setuptools. It is highly recommended you
8080
automate the building and uploading process so that other Scikit-HEP admins can
8181
make emergency (patch) releases if the need arises; non-standard/non-trivial

‎pages/packages/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ has_children: true
77
---
88

99
You can see our
10-
[affiliated projects]({{site.baseurl}}{% link pages/packages/affiliated.md %}),
11-
get links to [documentation]({{site.baseurl}}{% link pages/packages/documentation.md %}),
12-
see the [guidelines]({{site.baseurl}}{% link pages/packages/guidelines.md %}) for a new Scikit-HEP
10+
[affiliated projects]({% link pages/packages/affiliated.md %}),
11+
get links to [documentation]({% link pages/packages/documentation.md %}),
12+
see the [guidelines]({% link pages/packages/guidelines.md %}) for a new Scikit-HEP
1313
package to follow, and see our
14-
[statement on Python version support]({{site.baseurl}}{% link pages/packages/supported-python-versions.md %}) here too.
14+
[statement on Python version support]({% link pages/packages/supported-python-versions.md %}) here too.
1515

1616
{% include package_table.html badges="True" deprecated="True" %}

‎pages/packages/qr_codes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Project and package QR codes are made available for presentations, see the list
1111
<div class="text-center">
1212
{% for image in site.static_files %}
1313
{% if image.path contains 'images/projqrcode' %}
14-
<a href="{{ site.baseurl }}{{ image.path }}">
15-
<img src="{{ site.baseurl }}{{ image.path }}" alt="QR code" />
14+
<a href="{{ image.path }}">
15+
<img src="{{ image.path }}" alt="QR code" />
1616
</a>
1717
{% endif %}
1818
{% endfor %}

‎pages/projusers/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ of the Scikit-HEP project:
1414
- Peer reviewed journal papers.
1515
- General articles.
1616

17-
[projects]: {{ site.baseurl }}{% link pages/projusers/projects.md %}
18-
[publications]: {{ site.baseurl }}{% link pages/projusers/publications.md %}
17+
[projects]: {% link pages/projusers/projects.md %}
18+
[publications]: {% link pages/projusers/publications.md %}

‎pages/projusers/projects.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ of the Scikit-HEP project.
1919

2020
[atlas]: https://atlas.cern/
2121

22-
[img-ATLAS]: {{ site.baseurl }}{% link /assets/images/projusers/logo_atlas.png %}
22+
[img-ATLAS]: {% link /assets/images/projusers/logo_atlas.png %}
2323
{: width="140px"}
2424

2525
[![img-belle2]][belleii]
@@ -28,7 +28,7 @@ of the Scikit-HEP project.
2828

2929
[belleii]: https://www.belle2.org/
3030

31-
[img-belle2]: {{ site.baseurl }}{% link /assets/images/projusers/logo_belle2.png %}
31+
[img-belle2]: {% link /assets/images/projusers/logo_belle2.png %}
3232
{: width="70px"}
3333

3434
[![img-CMS]][cms]
@@ -37,7 +37,7 @@ of the Scikit-HEP project.
3737

3838
[cms]: https://cms.cern/
3939

40-
[img-CMS]: {{ site.baseurl }}{% link /assets/images/projusers/logo_cms.gif %}
40+
[img-CMS]: {% link /assets/images/projusers/logo_cms.gif %}
4141
{: width="70px"}
4242

4343
[![img-KM3NeT]][km3net]
@@ -47,7 +47,7 @@ an Astroparticle Physics European research infrastructure located in the Mediter
4747

4848
[km3net]: https://www.km3net.org/
4949

50-
[img-KM3NeT]: {{ site.baseurl }}{% link /assets/images/projusers/logo_km3net.png %}
50+
[img-KM3NeT]: {% link /assets/images/projusers/logo_km3net.png %}
5151
{: width="140px"}
5252

5353
[![img-LHCb]][lhcb]
@@ -56,7 +56,7 @@ an Astroparticle Physics European research infrastructure located in the Mediter
5656

5757
[lhcb]: http://lhcb.web.cern.ch/
5858

59-
[img-LHCb]: {{ site.baseurl }}{% link /assets/images/projusers/logo_lhcb.png %}
59+
[img-LHCb]: {% link /assets/images/projusers/logo_lhcb.png %}
6060
{: width="120px"}
6161

6262
## Computing and software institutes
@@ -66,11 +66,11 @@ an Astroparticle Physics European research infrastructure located in the Mediter
6666
[IRIS-HEP](https://iris-hep.org/) - the Institute for Research and Innovation in Software for High Energy Physics.
6767
IRIS-HEP both uses and contributes to Scikit-HEP: several colleagues are the principal developers of,
6868
or contributors to, several core project packages.
69-
[Read on funding →]({{site.baseurl}}{% link pages/about/funding.md %} )
69+
[Read on funding →]({% link pages/about/funding.md %} )
7070

7171
[iris-hep]: https://iris-hep.org/
7272

73-
[img-iris-hep]: {{ site.baseurl }}{% link /assets/images/projusers/logo_iris-hep.png %}
73+
[img-iris-hep]: {% link /assets/images/projusers/logo_iris-hep.png %}
7474
{: width="120px"}
7575

7676
## Phenomenology projects
@@ -82,7 +82,7 @@ the Standard Model and beyond.
8282

8383
[flavio]: https://flav-io.github.io/
8484

85-
[img-flavio]: {{ site.baseurl }}{% link /assets/images/projusers/logo_flavio.png %}
85+
[img-flavio]: {% link /assets/images/projusers/logo_flavio.png %}
8686
{: width="70px"}
8787

8888
## Software projects
@@ -96,7 +96,7 @@ Column Object Framework For Effective Analysis (COFFEA) for columnar analysis of
9696

9797
[coffea]: https://github.com/CoffeaTeam
9898

99-
[img-coffea]: {{ site.baseurl }}{% link /assets/images/projusers/logo_coffea.jpg %}
99+
[img-coffea]: {% link /assets/images/projusers/logo_coffea.jpg %}
100100
{: width="70px"}
101101

102102
[![img-zfit]][zfit]
@@ -107,5 +107,5 @@ manipulation of probability density functions.
107107

108108
[zfit]: https://github.com/zfit
109109

110-
[img-zfit]: {{ site.baseurl }}{% link /assets/images/projlogo/logo_zfit.png %}
110+
[img-zfit]: {% link /assets/images/projlogo/logo_zfit.png %}
111111
{: width="70px"}

‎pages/user/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ If you're having trouble installing Python packages or using ROOT with Scikit-HE
1212

1313
You can find more [resources here][resources], like tutorials, publications, and talks.
1414

15-
[installing-conda]: {{ site.baseurl }}{% link pages/user/installing-conda.md %}
16-
[resources]: {{ site.baseurl }}{% link pages/user/resources.md %}
15+
[installing-conda]: {% link pages/user/installing-conda.md %}
16+
[resources]: {% link pages/user/resources.md %}

‎pages/user/resources.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ or related to, the Scikit-HEP project.
472472
- **18 June 2019:** [LHCb experiment](http://lhcb.cern.ch/) Week, CERN:
473473

474474
- _Particles and decays in the Scikit-HEP project_, Eduardo Rodrigues
475-
\[[PDF]({{ site.baseurl }}{% link assets/resources/rodrigues-lhcb-2019-08-18.pdf %})\]
475+
\[[PDF]({% link assets/resources/rodrigues-lhcb-2019-08-18.pdf %})\]
476476

477477
- **18 June 2019:** [3rd CMS Machine Learning Workshop](https://indico.cern.ch/event/798721/):
478478

@@ -529,7 +529,7 @@ or related to, the Scikit-HEP project.
529529
Germany:
530530

531531
- _Python in High-Energy Physics_, Hans Dembinski
532-
\[[PDF]({{ site.baseurl }}{% link assets/resources/dembinski-pygamma19-2019-03-21.pdf %})\]
532+
\[[PDF]({% link assets/resources/dembinski-pygamma19-2019-03-21.pdf %})\]
533533

534534
- **15 October 2018:** [DIANA/HEP](https://www.diana-hep.org/) project
535535
[topical meeting](https://indico.cern.ch/event/754335/):
@@ -576,7 +576,7 @@ or related to, the Scikit-HEP project.
576576
Software Week, CERN:
577577

578578
- _The Scikit-HEP project_, Eduardo Rodrigues
579-
\[[PDF]({{ site.baseurl }}{% link assets/resources/rodrigues-lhcb-2017-04-06.pdf %})\]
579+
\[[PDF]({% link assets/resources/rodrigues-lhcb-2017-04-06.pdf %})\]
580580

581581
- **27 February 2017:** first presentation of the project,
582582
[DIANA/HEP](https://www.diana-hep.org/) project [topical

0 commit comments

Comments
 (0)