From 9521434ad2e02904251522b0a4e0194e3d38a1b8 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Mon, 18 Feb 2019 16:07:39 +0000 Subject: Installed astroquery in the pipeline All dependencies for building astroquery package have been done. Until nowthe Python dependencies were built in the same Makefile as the high level libraries and programs. But, because astroquery has many dependencies we split the Python and Python packages installation in a new Makefile. The installation of differents packages are done using Python and not pip, because we found some problems when doing it with pip. Apparently there are some interferences between the packages installed by the pip of the system and the pip installed as part of Python in the pipeline. --- reproduce/config/pipeline/dependency-versions.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'reproduce/config') diff --git a/reproduce/config/pipeline/dependency-versions.mk b/reproduce/config/pipeline/dependency-versions.mk index f0774bc..0aaceaf 100644 --- a/reproduce/config/pipeline/dependency-versions.mk +++ b/reproduce/config/pipeline/dependency-versions.mk @@ -52,8 +52,25 @@ zlib-version = 1.2.11 # # IMPORTANT: Fix url in `reproduce/src/make/dependencies.mk' # if changing the version +astroquery-version = 0.3.9 astropy-version = 3.1.1 +beautifulsoup4-version = 4.7.1 +certifi-version = 2018.11.29 +chardet-version = 3.0.4 +entrypoints-version = 0.3 +html5lib-version = 1.0.1 +idna-version = 2.8 +keyring-version = 18.0.0 numpy-version = 1.16.1 +pip-version = 19.0.2 +requests-version = 2.21.0 +setuptools-version = 40.8.0 +setuptools_scm-version = 3.2.0 +six-version = 1.12.0 +soupsieve-version = 1.8 +urllib3-version = 1.24.1 +virtualenv-version = 16.4.0 +webencodings-version = 0.5.1 # Special libraries # ----------------- -- cgit v1.2.1 From a92b25adb31bde17fe4db4f37be11bbe389fdf4b Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Thu, 21 Feb 2019 15:34:33 +0000 Subject: Matplotlib is now in the pipeline As matplotlib is a general package for plotting and it is widely used in science, we have added it to the pipeline. When installing a dependency of matplotlib `python-dateutil', we found a conflict in the download of the tarball. This is because the name has a dash (-) in the middle. In addition, the name starts with 'python', so it is the same as the python itself. Now it is possible to install any package with any name, just adding an elif in before the URL direction. --- reproduce/config/pipeline/dependency-versions.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'reproduce/config') diff --git a/reproduce/config/pipeline/dependency-versions.mk b/reproduce/config/pipeline/dependency-versions.mk index 0aaceaf..f242ac9 100644 --- a/reproduce/config/pipeline/dependency-versions.mk +++ b/reproduce/config/pipeline/dependency-versions.mk @@ -57,13 +57,19 @@ astropy-version = 3.1.1 beautifulsoup4-version = 4.7.1 certifi-version = 2018.11.29 chardet-version = 3.0.4 +cycler-version = 0.10.0 entrypoints-version = 0.3 html5lib-version = 1.0.1 idna-version = 2.8 +kiwisolver-version = 1.0.1 keyring-version = 18.0.0 +matplotlib-version = 3.0.2 numpy-version = 1.16.1 pip-version = 19.0.2 +pyparsing-version = 2.3.1 +python-dateutil-version = 2.8.0 requests-version = 2.21.0 +scipy-version = 1.2.1 setuptools-version = 40.8.0 setuptools_scm-version = 3.2.0 six-version = 1.12.0 -- cgit v1.2.1 From 69a780ef770034e69db96c2e1e8a4d83626a4d2f Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Thu, 28 Feb 2019 12:41:14 +0000 Subject: Python installation and related packages have been split Until now the installation of Python and its packages (numpy, astropy, astroquery, etc.) were done in the same `makefile'. With this commit the installation of Python and its packages have been split and now it is independent of the other programs. The installation of all Python packages needs to be written explicitely because pip is not used anymore. --- reproduce/config/pipeline/dependency-versions.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'reproduce/config') diff --git a/reproduce/config/pipeline/dependency-versions.mk b/reproduce/config/pipeline/dependency-versions.mk index f242ac9..655d44e 100644 --- a/reproduce/config/pipeline/dependency-versions.mk +++ b/reproduce/config/pipeline/dependency-versions.mk @@ -9,8 +9,9 @@ coreutils-version = 8.30 diffutils-version = 3.7 findutils-version = 4.6.0.199-e3fc flock-version = 0.2.3 +freetype-version = 2.9 gawk-version = 4.2.1 -gcc-version = 8.2.0 +gcc-version = 8.3.0 ghostscript-version = 9.26 git-version = 2.20.1 gmp-version = 6.1.2 @@ -18,12 +19,13 @@ gnuastro-version = 0.8 grep-version = 3.3 gzip-version = 1.10 isl-version = 0.18 -libtool-version = 2.4.6 libbsd-version = 0.9.1 +libpng-version = 1.6.36 +libtool-version = 2.4.6 lzip-version = 1.20 make-version = 4.2.90 metastore-version = 1.1.2-23-fa9170b -mpfr-version = 4.0.1 +mpfr-version = 4.0.2 mpc-version = 1.1.0 ncurses-version = 6.1 openssl-version = 1.1.1a -- cgit v1.2.1 From 41865272cd80856eb466daef029a669225dbf139 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Wed, 6 Mar 2019 17:12:19 +0000 Subject: Astroquery, astropy, matplotlib and numpy are now in the pipeline Until this commit, we had some of the python packages intalled but they did not work properly because of the `PYTHONPATH' variables. That is, the pipeline's `python' was the `python' of the system instead of the pipeline's `python'. With this commit this issue has been fixed by setting the correct `PYTHONPATH'. In this commit we also modify the installation of `bzip2' because `CMake' was complaining about some libraries built statically. --- reproduce/config/pipeline/dependency-versions.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'reproduce/config') diff --git a/reproduce/config/pipeline/dependency-versions.mk b/reproduce/config/pipeline/dependency-versions.mk index 655d44e..9104852 100644 --- a/reproduce/config/pipeline/dependency-versions.mk +++ b/reproduce/config/pipeline/dependency-versions.mk @@ -3,7 +3,6 @@ # Programs bash-version = 5.0 binutils-version = 2.31.1 -bzip2-version = 1.0.6 cmake-version = 3.12.4 coreutils-version = 8.30 diffutils-version = 3.7 @@ -83,9 +82,9 @@ webencodings-version = 0.5.1 # Special libraries # ----------------- # -# The shared library name of the following libraries is explicity mentioned -# the software build Makefiles (`reproduce/src/make/dependencies*.mk'). If -# you change their version, also please change the explicit shared library -# names also. +# When updating the version of these libraries, please look into the build +# rule first: In one way or another, the version string becomes necessary +# during their build and must be accounted for. +bzip2-version = 1.0.6 libgit2-version = 0.26.0 wcslib-version = 6.2 -- cgit v1.2.1