Skip to content

Commit 20dec97

Browse files
committed
Add pip install cdl[qt] to install DataLab with Qt (PyQt5 today)
Fix #54
1 parent 2a5b973 commit 20dec97

File tree

3 files changed

+51
-33
lines changed

3 files changed

+51
-33
lines changed

doc/intro/installation.rst

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,14 @@ Package manager ``pip``
4747
DataLab's package ``cdl`` is available on the Python Package Index (PyPI)
4848
on the following URL: https://pypi.python.org/pypi/cdl.
4949

50-
Installing DataLab from PyPI is as simple as running this command:
50+
Installing DataLab from PyPI with Qt is as simple as running this command
51+
(you may need to use ``pip3`` instead of ``pip`` on some systems):
52+
53+
.. code-block:: console
54+
55+
$ pip install cdl[qt]
56+
57+
Or, if you prefer, you can install DataLab without the Qt library (not recommended):
5158

5259
.. code-block:: console
5360
@@ -60,7 +67,7 @@ Installing DataLab from PyPI is as simple as running this command:
6067

6168
.. code-block:: console
6269
63-
$ pip install --upgrade cdl
70+
$ pip install --upgrade cdl[qt]
6471
6572
.. _install_aioinstaller:
6673

doc/locale/fr/LC_MESSAGES/intro/installation.po

Lines changed: 41 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: DataLab \n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2024-02-16 14:03+0100\n"
11+
"POT-Creation-Date: 2024-02-16 14:55+0100\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,11 +21,15 @@ msgstr ""
2121
msgid ""
2222
"How to install DataLab, the open-source data analysis and visualization "
2323
"platform"
24-
msgstr "Comment installer DataLab, la plateforme d'analyse et de visualisation de données open-source"
24+
msgstr ""
25+
"Comment installer DataLab, la plateforme d'analyse et de visualisation de"
26+
" données open-source"
2527

2628
#: ../../intro/installation.rst:-1
2729
msgid "DataLab, installation, install, pip, wheel, source, Windows, Linux, macOS"
28-
msgstr "DataLab, installation, installer, pip, wheel, source, Windows, Linux, macOS"
30+
msgstr ""
31+
"DataLab, installation, installer, pip, wheel, source, Windows, Linux, "
32+
"macOS"
2933

3034
#: ../../intro/installation.rst:4
3135
msgid "Installation"
@@ -104,8 +108,8 @@ msgstr ""
104108
msgid "Package manager ``pip``"
105109
msgstr "Gestionnaire de paquets ``pip``"
106110

107-
#: ../../intro/installation.rst:45 ../../intro/installation.rst:103
108-
#: ../../intro/installation.rst:117 ../../intro/installation.rst:147
111+
#: ../../intro/installation.rst:45 ../../intro/installation.rst:110
112+
#: ../../intro/installation.rst:124 ../../intro/installation.rst:154
109113
msgid ""
110114
":octicon:`info;1em;sd-text-info` :bdg-info-line:`GNU/Linux` :bdg-info-"
111115
"line:`Windows` :bdg-info-line:`macOS`"
@@ -120,12 +124,18 @@ msgstr ""
120124
"Python (PyPI) à l'adresse suivante : https://pypi.python.org/pypi/cdl."
121125

122126
#: ../../intro/installation.rst:50
123-
msgid "Installing DataLab from PyPI is as simple as running this command:"
124-
msgstr ""
125-
"L'installation de DataLab depuis PyPI est aussi simple que d'exécuter "
126-
"cette commande :"
127+
msgid ""
128+
"Installing DataLab from PyPI with Qt is as simple as running this command"
129+
" (you may need to use ``pip3`` instead of ``pip`` on some systems):"
130+
msgstr "L'installation de DataLab depuis PyPI avec Qt est aussi simple que d'exécuter cette commande (vous devrez peut-être utiliser ``pip3`` au lieu de ``pip`` sur certains systèmes) :"
127131

128-
#: ../../intro/installation.rst:58
132+
#: ../../intro/installation.rst:57
133+
msgid ""
134+
"Or, if you prefer, you can install DataLab without the Qt library (not "
135+
"recommended):"
136+
msgstr "Ou, si vous préférez, vous pouvez installer DataLab sans la bibliothèque Qt (non recommandé) :"
137+
138+
#: ../../intro/installation.rst:65
129139
msgid ""
130140
"If you already have a previous version of DataLab installed, you can "
131141
"upgrade it by running the same command with the ``--upgrade`` option:"
@@ -134,15 +144,15 @@ msgstr ""
134144
"pouvez la mettre à jour en exécutant la même commande avec l'option "
135145
"``--upgrade`` :"
136146

137-
#: ../../intro/installation.rst:68
147+
#: ../../intro/installation.rst:75
138148
msgid "All-in-one installer"
139149
msgstr "Installateur tout-en-un"
140150

141-
#: ../../intro/installation.rst:70
151+
#: ../../intro/installation.rst:77
142152
msgid ":octicon:`info;1em;sd-text-info` :bdg-info-line:`Windows`"
143153
msgstr ""
144154

145-
#: ../../intro/installation.rst:72
155+
#: ../../intro/installation.rst:79
146156
msgid ""
147157
"DataLab is available as a stand-alone application for Windows, which does"
148158
" not require any Python distribution to be installed. Just run the "
@@ -152,11 +162,11 @@ msgstr ""
152162
"Windows qui ne nécessite pas d'installation de Python. Il suffit "
153163
"d'exécuter l'installateur et vous êtes prêt à partir !"
154164

155-
#: ../../intro/installation.rst:78
165+
#: ../../intro/installation.rst:85
156166
msgid "DataLab all-in-one installer for Windows"
157167
msgstr "Installateur tout-en-un de DataLab pour Windows"
158168

159-
#: ../../intro/installation.rst:80
169+
#: ../../intro/installation.rst:87
160170
msgid ""
161171
"The installer package is available in the `Releases`_ section. It "
162172
"supports automatic uninstall and upgrade feature (no need to uninstall "
@@ -168,7 +178,7 @@ msgstr ""
168178
"besoin de désinstaller DataLab avant d'exécuter l'installateur d'une "
169179
"autre version de l'application)."
170180

171-
#: ../../intro/installation.rst:87
181+
#: ../../intro/installation.rst:94
172182
msgid ""
173183
"DataLab Windows installer is available for Windows 8, 10 and 11 (main "
174184
"release, based on Python 3.11) and also for Windows 7 SP1 (Python 3.8 "
@@ -179,7 +189,7 @@ msgstr ""
179189
"SP1 (version basée sur Python 3.8, voir le fichier se terminant par "
180190
"``-Win7.exe``)."
181191

182-
#: ../../intro/installation.rst:91
192+
#: ../../intro/installation.rst:98
183193
msgid ""
184194
":octicon:`alert;1em;sd-text-warning` On Windows 7 SP1, before running "
185195
"DataLab (or any other Python 3 application), you must install Microsoft "
@@ -195,11 +205,11 @@ msgstr ""
195205
"Microsoft Visual C++ 2015-2022 <https://learn.microsoft.com/en-"
196206
"us/cpp/windows/latest-supported-vc-redist?view=msvc-170>`_."
197207

198-
#: ../../intro/installation.rst:101
208+
#: ../../intro/installation.rst:108
199209
msgid "Wheel package"
200210
msgstr "Paquet Wheel"
201211

202-
#: ../../intro/installation.rst:105
212+
#: ../../intro/installation.rst:112
203213
msgid ""
204214
"On any operating system, using pip and the Wheel package is the easiest "
205215
"way to install DataLab on an existing Python distribution:"
@@ -208,27 +218,27 @@ msgstr ""
208218
"paquet Wheel est le moyen le plus simple d'installer DataLab sur une "
209219
"distribution Python existante :"
210220

211-
#: ../../intro/installation.rst:115
221+
#: ../../intro/installation.rst:122
212222
msgid "Source package"
213223
msgstr "Paquet source"
214224

215-
#: ../../intro/installation.rst:119
225+
#: ../../intro/installation.rst:126
216226
msgid ""
217227
"Installing DataLab directly from the source package may be done using "
218228
"``pip``:"
219229
msgstr ""
220230
"L'installation de DataLab directement depuis le paquet source peut être "
221231
"effectuée à l'aide de ``pip`` :"
222232

223-
#: ../../intro/installation.rst:125
233+
#: ../../intro/installation.rst:132
224234
msgid ""
225235
"Or, if you prefer, you can install it manually by running the following "
226236
"command from the root directory of the source package:"
227237
msgstr ""
228238
"Ou, si vous préférez, vous pouvez l'installer manuellement en exécutant "
229239
"la commande suivante depuis le répertoire racine du paquet source :"
230240

231-
#: ../../intro/installation.rst:132
241+
#: ../../intro/installation.rst:139
232242
msgid ""
233243
"Finally, you can also build your own Wheel package and install it using "
234244
"``pip``, by running the following command from the root directory of the "
@@ -240,11 +250,11 @@ msgstr ""
240250
" le répertoire racine du paquet source (cela nécessite que les paquets "
241251
"``build`` et ``wheel`` soient installés) :"
242252

243-
#: ../../intro/installation.rst:145
253+
#: ../../intro/installation.rst:152
244254
msgid "Development version"
245255
msgstr "Version de développement"
246256

247-
#: ../../intro/installation.rst:149
257+
#: ../../intro/installation.rst:156
248258
msgid ""
249259
"If you want to try the latest development version of DataLab, you can "
250260
"install it directly from the master branch of the Git repository."
@@ -253,15 +263,15 @@ msgstr ""
253263
"DataLab, vous pouvez l'installer directement depuis la branche principale"
254264
" du dépôt Git."
255265

256-
#: ../../intro/installation.rst:152
266+
#: ../../intro/installation.rst:159
257267
msgid ""
258268
"The first time you install DataLab from the Git repository, enter the "
259269
"following command:"
260270
msgstr ""
261271
"La première fois que vous installez DataLab depuis le dépôt Git, entrez "
262272
"la commande suivante :"
263273

264-
#: ../../intro/installation.rst:159
274+
#: ../../intro/installation.rst:166
265275
msgid ""
266276
"Then, if at some point you want to upgrade to the latest version of "
267277
"DataLab, just run the same command with options to force the reinstall of"
@@ -273,19 +283,19 @@ msgstr ""
273283
"forcer la réinstallation du paquet sans gérer les dépendances (car cela "
274284
"réinstallerait toutes les dépendances) :"
275285

276-
#: ../../intro/installation.rst:169
286+
#: ../../intro/installation.rst:176
277287
msgid ""
278288
"If dependencies have changed, you may need to execute the same command as"
279289
" above, but without the ``--no-deps`` option."
280290
msgstr ""
281291
"Si les dépendances ont changé, vous devrez peut-être exécuter la même "
282292
"commande que ci-dessus, mais sans l'option ``--no-deps``."
283293

284-
#: ../../intro/installation.rst:173
294+
#: ../../intro/installation.rst:180
285295
msgid "Dependencies"
286296
msgstr "Dépendances"
287297

288-
#: ../../intro/installation.rst:177
298+
#: ../../intro/installation.rst:184
289299
msgid ""
290300
"The DataLab all-in-one installer already include all those required "
291301
"libraries as well as Python itself."
@@ -525,7 +535,7 @@ msgstr ""
525535
msgid "Bootstrap-based Sphinx theme from the PyData community"
526536
msgstr "Thème Bootstrap pour Sphinx de la communauté PyData"
527537

528-
#: ../../intro/installation.rst:184
538+
#: ../../intro/installation.rst:191
529539
msgid "Python 3.11 and PyQt5 are the reference for production release"
530540
msgstr "Python 3.11 et PyQt5 sont les références pour la version de production"
531541

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ cdl-demo = "cdl.tests.scenarios.demo:run"
5656
cdl-tests = "cdl.tests:run"
5757

5858
[project.optional-dependencies]
59+
qt = ["PyQt5"]
5960
dev = ["black", "isort", "pylint", "Coverage", "pyinstaller>=6.0"]
6061
doc = ["PyQt5", "sphinx", "sphinx_intl", "sphinx-sitemap", "myst_parser", "sphinx_design", "sphinx-copybutton", "pydata-sphinx-theme"]
6162

0 commit comments

Comments
 (0)