Skip to content

Commit 2520b2f

Browse files
joonas-somerolvarinrkronberg
authored
Update the dependencies (and sort out the resulting mess) (#2246)
* Change order of install to make it more cacheable * Revert shallow cloning History is required by revision date plugin * Change command to dnf to reflect what's actually running * Upgrade Python to 3.11 * Upgrade Python packages * Upgrade Python environment * Adjust to accomodate new versions of dependencies * ...and who could forget Mr Travis C. Integration? * Add entry to What's new * Announcement for visual changes * Define repo_org,repo_name as ARG to facilitate experimentation * Update reference card screenshots Also, take the opportunity to move them into Allas * Don't clone repo if it already exits E.g. when building locally with Podman or Docker * Silence a deprecation warning pypa/pip#8559 * Join RUNs * Add missing date into What's new entry * Clone bare single branch * Update what's new entry date --------- Co-authored-by: Álvaro González <[email protected]> Co-authored-by: Rasmus Kronberg <[email protected]>
1 parent 3f51e7e commit 2520b2f

29 files changed

+652
-1009
lines changed

‎.vscode/tasks.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
"id": "snake",
4343
"color": "terminal.ansiBlue",
4444
},
45-
"command": ". ${userHome}/miniconda3/etc/profile.d/conda.sh && conda env create --force --yes --file ${workspaceFolder}/development/conda-docs-base-1.0.yaml",
45+
"command": ". ${userHome}/miniconda3/etc/profile.d/conda.sh && conda env create --force --yes --file ${workspaceFolder}/development/conda-docs-base-latest.yaml",
4646
"windows": {
47-
"command": "& '${env:LOCALAPPDATA}\\miniconda3\\shell\\condabin\\conda-hook.ps1' ; conda env create --force --yes --file '${workspaceFolder}\\development\\conda-docs-base-1.0.yaml'",
47+
"command": "& '${env:LOCALAPPDATA}\\miniconda3\\shell\\condabin\\conda-hook.ps1' ; conda env create --force --yes --file '${workspaceFolder}\\development\\conda-docs-base-latest.yaml'",
4848
},
4949
},
5050
{

‎Dockerfile

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,33 @@ LABEL maintainer="CSC Service Desk <[email protected]>"
55
# These need to be owned and writable by the root group in OpenShift
66
ENV ROOT_GROUP_DIRS='/var/run /var/log/nginx /var/lib/nginx'
77

8+
ARG repo_org=CSCfi
9+
ARG repo_name=csc-user-guide
810
ARG repo_branch=master
911

10-
RUN yum -y install epel-release &&\
11-
yum -y install nginx &&\
12-
yum -y install python38 &&\
13-
yum -y install git &&\
14-
yum -y install findutils &&\
15-
yum clean all
12+
COPY requirements.txt /tmp
13+
14+
WORKDIR /tmp
15+
16+
RUN dnf -y install epel-release \
17+
nginx \
18+
python3.11 \
19+
python3.11-pip \
20+
git \
21+
findutils &&\
22+
dnf clean all &&\
23+
pip3 install --use-pep517 --no-cache-dir -r requirements.txt
1624

1725
RUN chgrp -R root ${ROOT_GROUP_DIRS} &&\
1826
chmod -R g+rwx ${ROOT_GROUP_DIRS}
1927

2028
COPY . /tmp
2129

22-
WORKDIR /tmp
23-
24-
25-
RUN git clone --no-checkout https://github.com/CSCfi/csc-user-guide git_folder && \
26-
if [ -d ".git" ]; then rm -r .git; fi && \
27-
mv git_folder/.git . && \
28-
rm -r git_folder && \
29-
git reset HEAD --hard && \
30-
git checkout -f $repo_branch
31-
32-
RUN pip3 install --no-cache-dir -r requirements.txt && \
30+
RUN if [ ! -d ".git" ]; then \
31+
git clone --bare --single-branch --branch=$repo_branch https://github.com/$repo_org/$repo_name .git && \
32+
git init && \
33+
git switch --force $repo_branch; \
34+
fi && \
3335
bash scripts/generate_alpha.sh && \
3436
bash scripts/generate_by_system.sh && \
3537
bash scripts/generate_new.sh && \

‎csc-overrides/assets/stylesheets/admonition.css

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,131 +3,131 @@
33
display: none !important;
44
}
55

6-
.md-typeset :is(.admonition) {
7-
border: 2px solid;
6+
.md-typeset .admonition {
87
box-shadow: unset;
8+
border: 2px solid;
99
border-radius: 6px;
10-
font-size: var(--csc-font-size--body);
10+
border-left-width: 14px;
11+
font-size: medium;
1112
font-weight: var(--csc-font-weight--regular);
1213
}
1314

14-
.md-typeset :is(.admonition-title) {
15+
.md-typeset .admonition-title::before {
16+
display: none;
17+
}
18+
19+
.md-typeset .admonition-title {
1520
margin: unset !important;
1621
padding: unset !important;
1722
padding-top: .6rem !important;
18-
font-size: var(--csc-font-size--large);
1923
font-weight: var(--csc-font-weight--bold);
2024
background-color: unset !important;
2125
}
2226

23-
.md-typeset :is(.admonition-title)+* {
27+
.md-typeset .admonition-title + * {
2428
margin-top: 0;
2529
}
2630

27-
.md-typeset :is(.admonition-title)::before {
28-
display: none;
29-
}
30-
31-
[dir="ltr"] .md-typeset :is(.admonition) {
32-
border-left-width: var(--csc-admonition-border-left-width);
33-
}
34-
35-
.md-typeset :is(.admonition):not(
31+
.md-typeset .admonition:not(
3632
.default,
3733
.info,
3834
.success,
3935
.warning,
40-
.error) {
36+
.error
37+
) {
4138
border: unset;
4239
background-color: var(--csc-admonition--bg);
4340
color: var(--csc-admonition--fg);
4441
}
4542

46-
.md-typeset :is(.admonition):is(.default) {
43+
.md-typeset .admonition.default {
4744
border-color: var(--csc-admonition-default--border);
4845
}
4946

50-
.md-typeset :is(.admonition):is(.default-label) {
47+
.md-typeset .admonition.default-label {
5148
border-color: var(--csc-admonition-default-label--fg) !important;
5249
color: var(--csc-admonition-default-label--fg);
5350
background-color: var(--csc-admonition-default-label--bg);
5451
}
5552

56-
.md-typeset :is(.admonition):is(.info) {
53+
.md-typeset .admonition.info {
5754
border-color: var(--csc-admonition-info--border);
5855
}
5956

60-
.md-typeset :is(.admonition):is(.info-label) {
57+
.md-typeset .admonition.info-label {
6158
border-color: var(--csc-admonition-info-label--fg) !important;
6259
color: var(--csc-admonition-info-label--fg);
6360
background-color: var(--csc-admonition-info-label--bg);
6461
}
6562

66-
.md-typeset :is(.admonition):is(.success) {
63+
.md-typeset .admonition.success {
6764
border-color: var(--csc-admonition-success--border);
6865
}
6966

70-
.md-typeset :is(.admonition):is(.success-label) {
67+
.md-typeset .admonition.success-label {
7168
border-color: var(--csc-admonition-success-label--fg) !important;
7269
color: var(--csc-admonition-success-label--fg);
7370
background-color: var(--csc-admonition-success-label--bg);
7471
}
7572

76-
.md-typeset :is(.admonition):is(.warning) {
73+
.md-typeset .admonition.warning {
7774
border-color: var(--csc-admonition-warning--border);
7875
}
7976

80-
.md-typeset :is(.admonition):is(.warning-label) {
77+
.md-typeset .admonition.warning-label {
8178
border-color: var(--csc-admonition-warning-label--fg) !important;
8279
color: var(--csc-admonition-warning-label--fg);
8380
background-color: var(--csc-admonition-warning-label--bg);
8481
}
8582

86-
.md-typeset :is(.admonition):is(.error) {
83+
.md-typeset .admonition.error {
8784
border-color: var(--csc-admonition-error--border);
8885
}
8986

90-
.md-typeset :is(.admonition):is(.error-label) {
87+
.md-typeset .admonition.error-label {
9188
border-color: var(--csc-admonition-error-label--fg) !important;
9289
color: var(--csc-admonition-error-label--fg);
9390
background-color: var(--csc-admonition-error-label--bg);
9491
}
9592

96-
.md-typeset :is(.admonition):is(
93+
.md-typeset .admonition:is(
9794
.default-label,
9895
.info-label,
9996
.success-label,
10097
.warning-label,
101-
.error-label) {
98+
.error-label
99+
) {
102100
max-width: max-content;
103101
border: var(--csc-border);
104-
font-size: var(--csc-font-size--small);
105102
font-weight: var(--csc-font-weight--regular);
106103
}
107104

108-
.md-typeset :is(.admonition):is(
105+
.md-typeset .admonition:is(
109106
.default-label,
110107
.info-label,
111108
.success-label,
112109
.warning-label,
113-
.error-label) > .admonition-title {
110+
.error-label
111+
) > .admonition-title {
114112
display: none;
115113
}
116114

117-
.md-typeset :is(.admonition):is(
115+
.md-typeset .admonition:is(
118116
.default-label,
119117
.info-label,
120118
.success-label,
121119
.warning-label,
122-
.error-label) > :nth-child(2) {
120+
.error-label
121+
) > :nth-child(2) {
123122
margin-top: .1rem;
124123
}
125124

126-
.md-typeset :is(.admonition):is(
125+
.md-typeset .admonition:is(
127126
.default-label,
128127
.info-label,
129128
.success-label,
130129
.warning-label,
131-
.error-label) > :last-child {
130+
.error-label
131+
) > :last-child {
132132
margin-bottom: .1rem;
133133
}

‎csc-overrides/assets/stylesheets/announcement.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
.md-banner__inner p {
1313
margin: unset;
14-
font-size: var(--csc-font-size--small);
14+
font-size: small;
1515
color: var(--csc-admonition--fg);
1616
line-height: 2.0;
1717
}

‎csc-overrides/assets/stylesheets/breadcrumbs.css

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
.csc-breadcrumbs {
22
margin-bottom: .6rem;
3-
color: var(--csc-mid-grey--wcag);
4-
font-weight: var(--csc-font-weight--regular);
5-
font-size: var(--csc-font-size--body);
3+
color: var(--md-default-fg-color);
64
}
75

86
.csc-breadcrumbs__link {
9-
color: var(--csc-mid-grey--wcag) !important;
10-
text-decoration: unset !important;
7+
color: var(--md-default-fg-color) !important;
8+
text-decoration: none !important;
119
}
1210

1311
.csc-breadcrumbs__link:is(:focus, :hover) {
14-
background-color: unset !important;
15-
color: var(--md-typeset-a-color) !important;
12+
color: var(--md-accent-fg-color) !important;
13+
background-color: transparent !important;
1614
}
1715

1816
.csc-breadcrumbs__link::after {

‎csc-overrides/assets/stylesheets/code.css

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

0 commit comments

Comments
 (0)