Change working directory of venv_lock command

locusrobotics · May 28, 2020 · 6f4f40a · 6f4f40a
1 parent 592a1b7
commit 6f4f40a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake b/catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake
@@ -99,9 +99,10 @@ function(catkin_generate_virtualenv)
   if(DEFINED ARG_INPUT_REQUIREMENTS AND NOT package_requirements STREQUAL "")
     add_custom_command(COMMENT "Lock input requirements if they don't exist"
       OUTPUT ${package_requirements}
-      COMMAND ${CATKIN_ENV} rosrun catkin_virtualenv venv_lock ${venv_dir}
-        --package-name ${PROJECT_NAME} --input-requirements ${CMAKE_SOURCE_DIR}/${ARG_INPUT_REQUIREMENTS}
+      COMMAND ${CATKIN_ENV} rosrun catkin_virtualenv venv_lock ${CMAKE_BINARY_DIR}/${venv_dir}
+        --package-name ${PROJECT_NAME} --input-requirements ${ARG_INPUT_REQUIREMENTS}
         --no-overwrite --extra-pip-args ${processed_pip_args}
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       DEPENDS
         ${CMAKE_BINARY_DIR}/${venv_dir}/bin/python
         ${CMAKE_SOURCE_DIR}/${ARG_INPUT_REQUIREMENTS}
@@ -140,9 +141,10 @@ function(catkin_generate_virtualenv)
 
   add_custom_target(venv_lock
     COMMENT "Manually invoked target to generate the lock file on demand"
-    COMMAND ${CATKIN_ENV} rosrun catkin_virtualenv venv_lock ${venv_dir}
-      --package-name ${PROJECT_NAME} --input-requirements ${CMAKE_SOURCE_DIR}/${ARG_INPUT_REQUIREMENTS}
+    COMMAND ${CATKIN_ENV} rosrun catkin_virtualenv venv_lock ${CMAKE_BINARY_DIR}/${venv_dir}
+      --package-name ${PROJECT_NAME} --input-requirements ${ARG_INPUT_REQUIREMENTS}
       --extra-pip-args ${processed_pip_args}
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     DEPENDS
       ${venv_devel_dir}
       ${CMAKE_SOURCE_DIR}/${ARG_INPUT_REQUIREMENTS}

diff --git a/catkin_virtualenv/src/catkin_virtualenv/venv.py b/catkin_virtualenv/src/catkin_virtualenv/venv.py
@@ -148,11 +148,6 @@ def lock(self, package_name, input_requirements, no_overwrite, extra_pip_args):
 
         run_command(command, check=True)
 
-        # Remove user-specific paths
-        contents = open(output_requirements, 'r').read().replace(os.path.dirname(output_requirements), '.')
-        with open(output_requirements, 'w') as f:
-            f.write(contents)
-
         logger.info("Wrote new lock file to {}".format(output_requirements))
 
     def relocate(self, target_dir):

diff --git a/test_catkin_virtualenv/requirements.txt b/test_catkin_virtualenv/requirements.txt
@@ -1,8 +1,8 @@
 certifi==2020.4.5.1       # via requests
 chardet==3.0.4            # via requests
 idna==2.9                 # via requests
-packaging==20.4           # via -r /home/pbovbel/locus_dev/src/catkin_virtualenv/test_catkin_virtualenv/requirements.in
+packaging==20.4           # via -r requirements.in
 pyparsing==2.4.7          # via packaging
-requests==2.23.0          # via -r /home/pbovbel/locus_dev/src/catkin_virtualenv/test_catkin_virtualenv/requirements.in
-six==1.14.0               # via packaging
+requests==2.23.0          # via -r requirements.in
+six==1.15.0               # via packaging
 urllib3==1.25.9           # via requests
diff --git a/test_catkin_virtualenv_inherited/requirements.txt b/test_catkin_virtualenv_inherited/requirements.txt
@@ -1,5 +1,5 @@
 certifi==2020.4.5.1       # via requests
 chardet==3.0.4            # via requests
 idna==2.8                 # via requests
-requests==2.21.0          # via -r /home/pbovbel/locus_dev/src/catkin_virtualenv/test_catkin_virtualenv_inherited/requirements.in
+requests==2.21.0          # via -r requirements.in
 urllib3==1.24.3           # via requests
diff --git a/test_catkin_virtualenv_py3/requirements.in b/test_catkin_virtualenv_py3/requirements.in
@@ -1 +1,2 @@
 requests>=2
+packaging
diff --git a/test_catkin_virtualenv_py3/requirements.txt b/test_catkin_virtualenv_py3/requirements.txt
@@ -1,8 +1,8 @@
 certifi==2020.4.5.1       # via requests
 chardet==3.0.4            # via requests
 idna==2.9                 # via requests
-packaging==20.4           # via -r /home/pbovbel/locus_dev/src/catkin_virtualenv/test_catkin_virtualenv_py3/requirements.in
+packaging==20.4           # via -r requirements.in
 pyparsing==2.4.7          # via packaging
-requests==2.23.0          # via -r /home/pbovbel/locus_dev/src/catkin_virtualenv/test_catkin_virtualenv_py3/requirements.in
-six==1.14.0               # via packaging
+requests==2.23.0          # via -r requirements.in
+six==1.15.0               # via packaging
 urllib3==1.25.9           # via requests