Re: [PATCH 3/5] sphinx-pre-install: use a requirements file

[Mauro Carvalho Chehab]

Em Mon, 17 Jul 2017 08:00:07 +0200
Markus Heiser  escreveu:

> > Am 17.07.2017 um 00:08 schrieb Mauro Carvalho Chehab 
> > :
> > 
> > Instead of using 3 commands to install a virtualenv, use
> > a single one, reading the requirements from this file:
> > 
> > Documentation/sphinx/requirements.txt
> > 
> > Signed-off-by: Mauro Carvalho Chehab   
> 
> Hi Mauro,
> 
> I get a ..
> 
>  fatal: sha1 information is lacking or useless 
> (Documentation/doc-guide/sphinx.rst)
> 
> and  I miss the Documentation/doc-guide/sphinx.rst file in this patch.
> 
> Did it only happened to me?

Sorry, I forgot to mention. This patch depends on the patch series I
posted before adding information about the Sphinx install procedures:

[PATCH v2 0/6] Better document Sphinx install instructions

https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1444295.html


Thanks,
Mauro

Re: [PATCH 3/5] sphinx-pre-install: use a requirements file

[Mauro Carvalho Chehab]

Em Mon, 17 Jul 2017 08:00:07 +0200
Markus Heiser  escreveu:

> > Am 17.07.2017 um 00:08 schrieb Mauro Carvalho Chehab 
> > :
> > 
> > Instead of using 3 commands to install a virtualenv, use
> > a single one, reading the requirements from this file:
> > 
> > Documentation/sphinx/requirements.txt
> > 
> > Signed-off-by: Mauro Carvalho Chehab   
> 
> Hi Mauro,
> 
> I get a ..
> 
>  fatal: sha1 information is lacking or useless 
> (Documentation/doc-guide/sphinx.rst)
> 
> and  I miss the Documentation/doc-guide/sphinx.rst file in this patch.
> 
> Did it only happened to me?

Sorry, I forgot to mention. This patch depends on the patch series I
posted before adding information about the Sphinx install procedures:

[PATCH v2 0/6] Better document Sphinx install instructions

https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1444295.html


Thanks,
Mauro

Re: [PATCH 3/5] sphinx-pre-install: use a requirements file

[Markus Heiser]

> Am 17.07.2017 um 00:08 schrieb Mauro Carvalho Chehab 
> :
> 
> Instead of using 3 commands to install a virtualenv, use
> a single one, reading the requirements from this file:
> 
>   Documentation/sphinx/requirements.txt
> 
> Signed-off-by: Mauro Carvalho Chehab 

Hi Mauro,

I get a ..

 fatal: sha1 information is lacking or useless 
(Documentation/doc-guide/sphinx.rst)

and  I miss the Documentation/doc-guide/sphinx.rst file in this patch.

Did it only happened to me?

-- Markus --

Re: [PATCH 3/5] sphinx-pre-install: use a requirements file

[Markus Heiser]

> Am 17.07.2017 um 00:08 schrieb Mauro Carvalho Chehab 
> :
> 
> Instead of using 3 commands to install a virtualenv, use
> a single one, reading the requirements from this file:
> 
>   Documentation/sphinx/requirements.txt
> 
> Signed-off-by: Mauro Carvalho Chehab 

Hi Mauro,

I get a ..

 fatal: sha1 information is lacking or useless 
(Documentation/doc-guide/sphinx.rst)

and  I miss the Documentation/doc-guide/sphinx.rst file in this patch.

Did it only happened to me?

-- Markus --

[PATCH 3/5] sphinx-pre-install: use a requirements file

[Mauro Carvalho Chehab]

Instead of using 3 commands to install a virtualenv, use
a single one, reading the requirements from this file:

Documentation/sphinx/requirements.txt

Signed-off-by: Mauro Carvalho Chehab 
---
 scripts/sphinx-pre-install | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index bcd6f7978f8d..230d9cc7ee1d 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -14,6 +14,7 @@ use strict;
 # GNU General Public License for more details.
 
 my $virtenv_dir = "sphinx_1.4";
+my $requirement_file = "Documentation/sphinx/requirements.txt";
 
 #
 # Static vars
@@ -467,9 +468,7 @@ sub check_needs()
 
printf "\t$virtualenv $virtenv_dir\n";
printf "\t. $activate\n";
-   printf "\tpip install 'docutils==0.12'\n";
-   printf "\tpip install 'Sphinx==1.4.9'\n";
-   printf "\tpip install sphinx_rtd_theme\n";
+   printf "\tpip install -r $requirement_file\n";
$need++;
}
}
-- 
2.13.3

[PATCH 3/5] sphinx-pre-install: use a requirements file

[Mauro Carvalho Chehab]

Instead of using 3 commands to install a virtualenv, use
a single one, reading the requirements from this file:

Documentation/sphinx/requirements.txt

Signed-off-by: Mauro Carvalho Chehab 
---
 scripts/sphinx-pre-install | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index bcd6f7978f8d..230d9cc7ee1d 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -14,6 +14,7 @@ use strict;
 # GNU General Public License for more details.
 
 my $virtenv_dir = "sphinx_1.4";
+my $requirement_file = "Documentation/sphinx/requirements.txt";
 
 #
 # Static vars
@@ -467,9 +468,7 @@ sub check_needs()
 
printf "\t$virtualenv $virtenv_dir\n";
printf "\t. $activate\n";
-   printf "\tpip install 'docutils==0.12'\n";
-   printf "\tpip install 'Sphinx==1.4.9'\n";
-   printf "\tpip install sphinx_rtd_theme\n";
+   printf "\tpip install -r $requirement_file\n";
$need++;
}
}
-- 
2.13.3