Skip to content

Commit 8353262

Browse files
committed
Update update section.
1 parent a4c8de5 commit 8353262

File tree

2 files changed

+89
-52
lines changed

2 files changed

+89
-52
lines changed

docs/update/dev.rst

Lines changed: 41 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,36 @@
11
Development version
22
-------------------
33

4-
IMPORTANT INFORMATION for :code:`dev >= 3.2.11`
4+
Important information for :code:`dev >= 3.2.11`
55
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66

7-
.. warning::
7+
When you update from dev@<=3.2.10 or master@<=3.2.2 to newer release, there
8+
will be made a SQL conversion of the databases table layout.
9+
This can take up a sagnificent amount of time based on the size of the
10+
database.
811

9-
::
12+
The table layout converion is being made to:
13+
14+
1. Minimize the total size
1015

11-
When you update from dev@<=3.2.10 or master@<=3.2.2
12-
to newer release, there will be made a SQL
13-
conversion of the databases table layout.
14-
This can take up a sagnificent amount of time
15-
based on the size of the Database.
16+
2. Optimize the sql flow and minimizing the read/write to save disk I/O.
1617

17-
The table layout converion is being made to:
18+
3. Minimize the number of SQL queries being made
1819

19-
1. Minimize the total size
20+
It have been seen taking days to convert these tables on very large
21+
installations.
2022

21-
2. Optimize the sql flow and minimizing the
22-
read/write to save disk I/O
2323

24-
3. Minimize the number of SQL queries being made
24+
Important information for :code:`dev >= 4.0.0`
25+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2526

26-
It have been seen taking days to convert these
27-
tables on very large installations.
27+
When you update to PyFunceble :code:`4.0.0`, there will be
28+
29+
- a SQL conversion if you use the :code:`mysql` or `mariadb` database type.
30+
- a JSON to CSV conversion if one of those files is found in your filesystem:
31+
32+
- :code:`inactive_db.json`
33+
- :code:`whois_db.json`
2834

2935

3036
For development
@@ -58,9 +64,13 @@ From PyPi
5864
$ pip3 install --user --upgrade PyFunceble-dev
5965

6066
.. note::
61-
We recommend the :code:`--user` flag which installs the required dependencies at the user level. More information about it can be found on `pip documentation`_.
67+
We recommend the :code:`--user` flag which installs the required dependencies
68+
at the user level. More information about it can be found on
69+
`pip documentation`_.
70+
6271
.. warning::
63-
We do not recommend the :code:`--user` flag when using :code:`PyFunceble` into containers like - for example - Travis CI.
72+
We do not recommend the :code:`--user` flag when using :code:`PyFunceble`
73+
into containers like - for example - Travis CI.
6474

6575
From GitHub
6676
~~~~~~~~~~~
@@ -70,9 +80,12 @@ From GitHub
7080
$ pip3 install --user --upgrade git+https://github.com/funilrys/PyFunceble.git@dev#egg=PyFunceble
7181

7282
.. note::
73-
We recommend the :code:`--user` flag which installs the required dependencies at the user level. More information about it can be found on `pip documentation`_.
83+
We recommend the :code:`--user` flag which installs the required dependencies
84+
at the user level. More information about it can be found on
85+
`pip documentation`_.
7486
.. warning::
75-
We do not recommend the :code:`--user` flag when using :code:`PyFunceble` into containers like - for example - Travis CI.
87+
We do not recommend the :code:`--user` flag when using :code:`PyFunceble`
88+
into containers like - for example - Travis CI.
7689

7790
Using the AUR (for Arch Linux users)
7891
""""""""""""""""""""""""""""""""""""
@@ -90,8 +103,10 @@ With your favorite AUR helper
90103
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
91104

92105
.. warning::
93-
We do not recommend any AUR helper but keep in mind that some AUR helpers are "better" than other.
94-
For more information about your current (or any other) AUR helper please report to `the ArchWiki page`_.
106+
We do not recommend any AUR helper but keep in mind that some AUR helpers
107+
are "better" than other.
108+
For more information about your current (or any other) AUR helper please
109+
report to `the ArchWiki page`_.
95110

96111
::
97112

@@ -126,12 +141,14 @@ Execute the following and enjoy PyFunceble!
126141
$ git fetch origin && git merge origin/dev
127142
$ python3 setup.py test
128143
$ python3 setup.py install # Avoid this if you want to uninstall one day.
129-
$ pip3 install --user --upgrade -e .
144+
$ pip3 install --user --upgrade -e . # Prefer this method.
130145

131146
.. note::
132-
We recommend the :code:`--user` flag which installs the required dependencies at the user level. More information about it can be found on `pip documentation`_.
147+
We recommend the :code:`--user` flag which installs the required dependencies
148+
at the user level. More information about it can be found on `pip documentation`_.
133149
.. warning::
134-
We do not recommend the :code:`--user` flag when using :code:`PyFunceble` into containers like - for example - Travis CI.
150+
We do not recommend the :code:`--user` flag when using :code:`PyFunceble`
151+
into containers or CI engines.
135152

136153

137154
.. _the ArchWiki page: https://wiki.archlinux.org/index.php/AUR_helpers

docs/update/stable.rst

Lines changed: 48 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,38 @@
11
Stable version
22
--------------
33

4-
Using :code:`pip`
5-
^^^^^^^^^^^^^^^^^
4+
Important information for :code:`dev >= 3.2.11`
5+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66

7-
IMPORTANT INFORMATION for :code:`master >= 3.3.0`
8-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7+
When you update from dev@<=3.2.10 or master@<=3.2.2 to newer release, there
8+
will be made a SQL conversion of the databases table layout.
9+
This can take up a sagnificent amount of time based on the size of the
10+
database.
911

10-
.. warning::
12+
The table layout converion is being made to:
1113

12-
::
14+
1. Minimize the total size
15+
16+
2. Optimize the sql flow and minimizing the read/write to save disk I/O.
17+
18+
3. Minimize the number of SQL queries being made
1319

14-
When you update from version before 3.3.0
15-
to newer release, there will be made a SQL
16-
conversion of the databases table layout.
17-
This can take up a sagnificent amount of time
18-
based on the size of the Database.
20+
It have been seen taking days to convert these tables on very large
21+
installations.
1922

20-
The table layout converion is being made to:
23+
Important information for :code:`dev >= 4.0.0`
24+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2125

22-
1. Minimize the total size
26+
When you update to PyFunceble :code:`4.0.0`, there will be
2327

24-
2. Optimize the sql flow and minimizing the
25-
read/write to save disk I/O
28+
- a SQL conversion if you use the :code:`mysql` or `mariadb` database type.
29+
- a JSON to CSV conversion if one of those files is found in your filesystem:
2630

27-
3. Minimize the number of SQL queries being made
31+
- :code:`inactive_db.json`
32+
- :code:`whois_db.json`
2833

29-
It have been seen taking days to convert these
30-
tables on very large installations.
34+
Using :code:`pip`
35+
^^^^^^^^^^^^^^^^^
3136

3237
From PyPi
3338
"""""""""
@@ -37,9 +42,13 @@ From PyPi
3742
$ pip3 install --user --upgrade PyFunceble
3843

3944
.. note::
40-
We recommend the :code:`--user` flag which installs the required dependencies at the user level. More information about it can be found on `pip documentation`_.
45+
We recommend the :code:`--user` flag which installs the required dependencies
46+
at the user level. More information about it can be found on
47+
`pip documentation`_.
48+
4149
.. warning::
42-
We do not recommend the :code:`--user` flag when using :code:`PyFunceble` into containers like - for example - Travis CI.
50+
We do not recommend the :code:`--user` flag when using :code:`PyFunceble`
51+
into containers or CI engines.
4352

4453
From GitHub
4554
"""""""""""
@@ -49,9 +58,13 @@ From GitHub
4958
$ pip3 install --user --upgrade git+https://github.com/funilrys/PyFunceble.git@master#egg=PyFunceble
5059

5160
.. note::
52-
We recommend the :code:`--user` flag which installs the required dependencies at the user level. More information about it can be found on `pip documentation`_.
61+
We recommend the :code:`--user` flag which installs the required dependencies
62+
at the user level. More information about it can be found on
63+
`pip documentation`_.
64+
5365
.. warning::
54-
We do not recommend the :code:`--user` flag when using :code:`PyFunceble` into containers like - for example - Travis CI.
66+
We do not recommend the :code:`--user` flag when using :code:`PyFunceble`
67+
into containers or CI engines.
5568

5669
Using the AUR (for Arch Linux users)
5770
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -69,12 +82,14 @@ With your favorite AUR helper
6982
"""""""""""""""""""""""""""""
7083

7184
.. warning::
72-
We do not recommend any AUR helper but keep in mind that some AUR helpers are "better" than other.
73-
For more information about your current (or any other) AUR helper please report to `the ArchWiki page`_.
85+
We do not recommend any AUR helper but keep in mind that some AUR helpers
86+
are "better" than other.
87+
For more information about your current (or any other) AUR helper please
88+
report to `the ArchWiki page`_.
7489

7590
::
7691

77-
$ yourFavoriteAurHelper -Syu python-pyfunceble
92+
$ yourFavoriteAurHelper -Syu python-pyfunceble
7893

7994
Using docker (hub)
8095
^^^^^^^^^^^^^^^^^^
@@ -106,12 +121,17 @@ Execute the following and enjoy PyFunceble!
106121
$ git checkout master && git fetch origin && git merge origin/master
107122
$ python3 setup.py test
108123
$ python3 setup.py install # Avoid this if you want to uninstall one day.
109-
$ pip3 install --user --upgrade -e .
124+
$ pip3 install --user --upgrade -e . # Prefer this method.
110125

111126
.. note::
112-
We recommend the :code:`--user` flag which installs the required dependencies at the user level. More information about it can be found on `pip documentation`_.
127+
We recommend the :code:`--user` flag which installs the required dependencies
128+
at the user level. More information about it can be found on
129+
`pip documentation`_.
130+
131+
113132
.. warning::
114-
We do not recommend the :code:`--user` flag when using :code:`PyFunceble` into containers like - for example - Travis CI.
133+
We do not recommend the :code:`--user` flag when using :code:`PyFunceble`
134+
into containers like - for example - Travis CI.
115135

116136

117137
.. _the ArchWiki page: https://wiki.archlinux.org/index.php/AUR_helpers

0 commit comments

Comments
 (0)