PYROS-IRAP / pyros

Commit 17c6eca029423bf02e5d3d68a0eeb31fa6ee4e42

Authored by Alexis Koralewski
1 parent a61177f4
Exists in dev

Adding git clone of guitastro in docker build and install of python packages of … 

…guistastro, changing pyros.py accordingly
Showing 3 changed files with 6 additions and 7 deletions   Show diff stats
Inline Side-by-side
@@ -180,7 +180,8 @@ RUN pip install --user click @@ -180,7 +180,8 @@ RUN pip install --user click
180 # - But we can at least use it to generate all the requirements*.txt files in a far better format 180 # - But we can at least use it to generate all the requirements*.txt files in a far better format
181 RUN pip install --user pip-tools 181 RUN pip install --user pip-tools
182 182
183 - 183 +# Installing packages required for Guitastro
  184 +RUN pip install --user -r ./vendor/guitastro/install/requirements.txt
184 185
185 # Installing packages required for PyROS 186 # Installing packages required for PyROS
186 RUN pip install --user -r ./install/requirements.txt 187 RUN pip install --user -r ./install/requirements.txt
docker/PYROS_DOCKER_BUILD.bat
  Diff comments   View file @17c6eca
1 #git pull 1 #git pull
  2 +git clone https://gitlab.irap.omp.eu/aklotz/guitastro.git ../vendor/guitastro/
2 3
3 CURRENT_UID=$(id -u) docker-compose build 4 CURRENT_UID=$(id -u) docker-compose build
4 5
@@ -626,20 +626,17 @@ def install_or_update(UPDATE: bool = False, with_packages: bool = True, with_dat @@ -626,20 +626,17 @@ def install_or_update(UPDATE: bool = False, with_packages: bool = True, with_dat
626 change_dir("..") 626 change_dir("..")
627 print(os.getcwd()) 627 print(os.getcwd())
628 # 1) clone repo if not yet done 628 # 1) clone repo if not yet done
629 - if not os.path.exists(GUITASTRO_PATH): 629 + if not os.path.exists(GUITASTRO_PATH) and not WITH_DOCKER :
630 print("Guitastro : Cloning repository") 630 print("Guitastro : Cloning repository")
631 cloned_repo = Repo.clone_from( 631 cloned_repo = Repo.clone_from(
632 "https://gitlab.irap.omp.eu/aklotz/guitastro.git", GUITASTRO_PATH) 632 "https://gitlab.irap.omp.eu/aklotz/guitastro.git", GUITASTRO_PATH)
633 print("Cloned successfully: ", cloned_repo.__class__ is Repo) 633 print("Cloned successfully: ", cloned_repo.__class__ is Repo)
634 # 2) install/update requirements & generate API doc 634 # 2) install/update requirements & generate API doc
635 - if os.path.exists(GUITASTRO_PATH): 635 + if os.path.exists(GUITASTRO_PATH) and not WITH_DOCKER:
636 # TODO: update guitastro (git pull from vendor/guitastro/) 636 # TODO: update guitastro (git pull from vendor/guitastro/)
637 print("\nGuitastro : Installing/Updating python package dependencies\n") 637 print("\nGuitastro : Installing/Updating python package dependencies\n")
638 # Upgrade pip if new version available 638 # Upgrade pip if new version available
639 - if WITH_DOCKER:  
640 - os.system(VENV_PYTHON + ' -m pip install --user --upgrade pip')  
641 - else:  
642 - os.system(VENV_PYTHON + ' -m pip install --upgrade pip') 639 + os.system(VENV_PYTHON + ' -m pip install --upgrade pip')
643 # TODO: faire les apt-get intall aussi (indi, ...) 640 # TODO: faire les apt-get intall aussi (indi, ...)
644 venv_pip_install2(GUITASTRO_PATH + '/install/requirements.txt', '-r') 641 venv_pip_install2(GUITASTRO_PATH + '/install/requirements.txt', '-r')
645 #venv_pip_install2(GUITASTRO_PATH + '/install/requirements_linux.txt', '-r') 642 #venv_pip_install2(GUITASTRO_PATH + '/install/requirements_linux.txt', '-r')