Skip to content

Commit

Permalink
Merge branch 'develop' into 263-move-data-contribution-guide
Browse files Browse the repository at this point in the history
  • Loading branch information
prudhomm authored Jul 16, 2024
2 parents f213434 + 4002ad3 commit c63aae2
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 29 deletions.
2 changes: 1 addition & 1 deletion docs/user/modules/install/pages/deb.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ NOTE: {feelpp} does not rely on `focal-proposed` to build, only on the standard
|python3-feelpp| Python3 bindings
|feelpp-data| data files (geometry and config files) for {feelpp} applications (e.g. feelpp-quickstart)
|libfeelpp-toolboxes1| toolboxes shared libraries
|libfeelpp-toolboxes-dev| toolboxes development headers and libraries
|libfeelpp-toolboxes1-all-dev| toolboxes development headers and libraries
|feelpp-toolboxes| xref:using:index.adoc#_using_feel_toolboxes[toolbox applications]
|feelpp-toolboxes-data| data files (geometry and config files) for {feelpp} toolboxes

Expand Down
34 changes: 17 additions & 17 deletions docs/user/modules/install/pages/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,17 @@ Ubuntu LTS distributions jammy(22.04-preferred) is supported.
We may support short term distributions.
[[jammy]]
[[noble]]
[discrete]
=== Jammy LTS (22.04)
=== Noble Numbat LTS (24.04)
par::[ubuntu,jammy,latest]
par::[ubuntu,noble,latest]
[[lunar]]
[discrete]
=== Lunar (23.04)
par::[ubuntu,lunar,latest]
[[kinetic]]
[[jammy]]
[discrete]
=== Kinetic (22.10)
=== Jammy LTS (22.04)
par::[ubuntu,kinetic,latest]
par::[ubuntu,jammy,latest]
[[focal]]
[discrete]
Expand All @@ -59,9 +53,8 @@ The supported systems are described below
|===
|Distribution | Release | Version | Supported Channels | Comment
|ubuntu | noble | 24.04 | latest | LTS
|ubuntu | jammy | 22.04 | latest | LTS
|ubuntu | lunar | 23.04 | latest |
|ubuntu | kinetic | 22.10 | latest |
|ubuntu | focal | 20.04 | latest | LTS
Expand All @@ -72,7 +65,7 @@ include::partial$install-deb.adoc[]
Debian::
+
--
Debian LTS distributions bookworm(12) and bullseye(11) are supported.
Debian LTS distribution bookworm(12) is supported.
//Debian Sid packages are also available.
Expand All @@ -83,7 +76,6 @@ The supported systems are described below
|Distribution | Release | Version | Supported Channels | Comment
|debian |bookworm | 12 | latest | LTS
|debian |bullseye | 11 | latest | LTS
|debian |testing| - | latest | testing
|debian |sid| - | latest | unstable
Expand Down Expand Up @@ -139,7 +131,7 @@ Windows 10::
To use {feelpp} on Windows 10, follow these steps:
* [x] install https://docs.microsoft.com/fr-fr/windows/wsl/install-win10:[WSL (Windows Subsystem for Linux)]
* [x] install https://docs.microsoft.com/en-us/windows/wsl/install-manual#downloading-distributions[Ubuntu focal (20.04) Ubuntu jammy(22.04) or Debian bullseye(11)]
* [x] install https://docs.microsoft.com/en-us/windows/wsl/install-manual#downloading-distributions[Ubuntu jammy(22.04) Ubuntu focal (20.04) or Debian bookworm(12)]
* [x] follow the corresponding Ubuntu or Debian {feelpp} installation steps
include::partial$install-deb.adoc[]
Expand All @@ -163,6 +155,14 @@ docker run --rm -it -v $HOME/feel:/feel ghcr.io/feelpp/feelpp:jammy
docker pull ghcr.io/feelpp/feelpp-dev:jammy
docker run --rm -it -v $HOME/feel:/feel ghcr.io/feelpp/feelpp-dev:jammy
----
[NOTE]
----
These images are also available for
* Ubuntu 20.04 (focal): ghcr.io/feelpp/feelpp:focal
* Debian 12 (bookworm): ghcr.io/feelpp/feelpp:bookworm
----
--
// MacOSX::
// +
Expand Down
4 changes: 2 additions & 2 deletions docs/user/modules/install/partials/install-deb.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ We describe here the installation of the debian packages for LTS distributions.
|python3-feelpp| Python3 bindings
|feelpp-data| data files (geometry and config files) for {feelpp} applications (e.g. feelpp-quickstart)
|libfeelpp-toolboxes1| toolboxes shared libraries
|libfeelpp-toolboxes-dev| toolboxes development headers and libraries
|libfeelpp-toolboxes1-all-dev| toolboxes development headers and libraries
|feelpp-toolboxes| xref:using:index.adoc#_using_feel_toolboxes[toolbox applications]
|feelpp-toolboxes-data| data files (geometry and config files) for {feelpp} toolboxes

Expand All @@ -38,7 +38,7 @@ We describe here the installation of the debian packages for LTS distributions.
$ sudo apt install feelpp-toolboxes feelpp-toolboxes-data

.Install the toolboxes development environment
$ sudo apt install libfeelpp-toolboxes-dev
$ sudo apt install libfeelpp-toolboxes1-all-dev

.Reinstall the runtime environment feelpp, the toolboxes and the python3 packages
$ sudo apt install --reinstall 'feelpp-*' 'libfeelpp1' 'python3-feelpp-*'
Expand Down
15 changes: 7 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@feelpp/asciidoctor-remote-include-processor": "^0.0.6",
"asciidoctor": "^2.2.6",
"asciidoctor-emoji": "^0.4.2",
"asciidoctor-jupyter": "^0.5.0",
"asciidoctor-jupyter": "^0.7.0",
"asciidoctor-kroki": "^0.17.0",
"handlebars-utils": "^1.0.6",
"node-srv": "^3.0.3"
Expand Down

0 comments on commit c63aae2

Please sign in to comment.