Merge pull request #70 from asmodehn/gopher-devel

Gopher devel
pyros-dev · Jan 13, 2017 · 567a718 · 567a718
2 parents a82b2d0 + 456b79f
commit 567a718
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,17 @@
 Changelog for package catkin_pip
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.17 (2017-01-13)
+-------------------
+* now always ignore-installed when installing requirements.
+* pinned pip to 8.1.2 because of https://github.com/asmodehn/catkin_pip/issues/58
+* Merge pull request `#57 <https://github.com/asmodehn/catkin_pip/issues/57>`_ from asmodehn/devel
+  upgrading gopher_devel
+* Merge pull request `#56 <https://github.com/asmodehn/catkin_pip/issues/56>`_ from asmodehn/gopher-devel
+  drop some echoing
+* drop some echoing
+* Contributors: AlexV, Daniel Stonier, alexv
+
 0.1.16 (2016-09-05)
 -------------------
 * now also checking for --system for pip > 6.0.0.

diff --git a/cmake/catkin-pip-base.req b/cmake/catkin-pip-base.req
@@ -1,4 +1,4 @@
 # Basic tools to install, simulating virtualenv creation behavior.
 # Not setting any version here to force catkin-pip to follow python and not remain stuck on deprecated versions.
-pip
+pip==8.1.2  # pip > 9.0 tries to remove egg-info/entry_points.txt from /opt/yujin/amd64/indigo-devel/lib/python2.7/dist-packages/pyros-... even if we specify /home/alexv/ROS/gopher_bootstrap/build/catkin_pip_env/bin/pip install -e /home/alexv/ROS/gopher_bootstrap/src/pyros --ignore-installed --no-dependencies --prefix /home/alexv/ROS/gopher_bootstrap/devel
 setuptools
diff --git a/cmake/catkin-pip-requirements.cmake.in b/cmake/catkin-pip-requirements.cmake.in
@@ -28,6 +28,6 @@ function(catkin_pip_requirements requirements_txt)
     catkin_pip_setup_prefix(${CATKIN_PIP_ENV})
 
     # runnig the pip command (configure time)
-    catkin_pip_runcmd(${CATKIN_PIP} install ${ARGN} -r ${requirements_txt} --src ${CMAKE_SOURCE_DIR} --exists-action b --prefix "${CATKIN_DEVEL_PREFIX}")
+    catkin_pip_runcmd(${CATKIN_PIP} install ${ARGN} -r ${requirements_txt} --ignore-installed --src ${CMAKE_SOURCE_DIR} --exists-action b --prefix "${CATKIN_DEVEL_PREFIX}")
 
 endfunction()
diff --git a/package.xml b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>catkin_pip</name>
-  <version>0.1.16</version>
+  <version>0.1.17</version>
   <description>
     Catkin macros to allow using pure python packages in usual catkin workspaces with normal python workflow.
   </description>