diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..e926d1a --- /dev/null +++ b/debian/changelog @@ -0,0 +1,226 @@ +ros-kinetic-catkin-virtualenv (0.6.1-1xenial) xenial; urgency=high + + * Correct dependencies and autoformat (#72 ) + * Remove python-virtualenv dep + * Add python2-dev + * Lint + * We're ok with any 44.x version of setuptools (#71 ) + But not anything newer. + Older versions don't appear to work reliably with pip==20.1. + This helps when running a build of a package depending on catkin_virtualenv on OS which ship with an old version of setuptools (such as Ubuntu Xenial) when USE_SYSTEM_PACKAGES is not set to FALSE. In that situation, only specifying 'setuptools<45` will be true, as setuptools is installed (in the systems site packages), so pip will not upgrade it. Specifying a minimum version like this will force pip to always install an up-to-date version. + * Contributors: G.A. vd. Hoorn, Paul Bovbel + + -- Paul Bovbel Mon, 24 Aug 2020 04:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.6.0-1xenial) xenial; urgency=high + + * Don't require catkin_package to be called before catkin_generate_virtualenv (#67 ) + * Revert "Downgrade docutils so that boto works (#66 )" + This reverts commit 998cd6add2e43e12036d0db15a7c4d58fe3411cf. + * Downgrade docutils so that boto works (#66 ) + See https://github.com/boto/botocore/issues/1942 and related threads. + * Make regex for Python bytecode more selective (#65 ) + Fix regex to match only files ending in ".py[co]" and not files ending + in "py[co]". + * Remove user specific paths (#63 ) + * Remove user specific paths + * Change working directory of venv_lock command + * Lock catkin_virtualenv base requirements + Co-authored-by: Paul Bovbel + * RST-3172 Check that requirements file is locked (#62 ) + * Two helpful hints (#61 ) + * Fix input requirements warning (#58 ) + * Only warn about INPUT_REQUIREMENTS if a package exports requirements to begin with + * Update catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake + Co-authored-by: Andrew Blakey + Co-authored-by: Andrew Blakey + * Preserve symlinks during copy (#57 ) + * Don't ignore unknown args + * RST-3172 Refactor catkin_virtualenv to allow locking dependencies (#55 ) + * Remove unused options + * Fix regex for comments + * Migrate scripts + * Remove old code + * Move common requirements to an export file + * Minor cleanup + * Remove requirement-parsing unit tests + * Fix logging config + * Fix test builds + * Generate lock files + * Fix tests + * Move dh-virtualenv functions into separate file + * Fix roslint + * Update docs + * Update requirements + * CMake comments + * Fix pip-args + * README fixup + * Correct ARG_LOCK_FILE handling + * Remove headers + * Use set comprehension + * Add migration doc + * Respin + * Use exec to dive into python (#51 ) + * First python2 issue of 2020 (#49 ) + * Clean up options, virtualenv installs setuptools by default + * Make sure we install a compatible setuptools version for py2 venv + * catkin-pkg-modules has disappeared off pypi (#46 ) + * catkin-pkg-modules has disappeared off pypi, but catkin-pkg is still there + * Version all requirements + * Contributors: David V. Lu!!, Michael Johnson, Paul Bovbel, abencz + + -- Paul Bovbel Tue, 14 Jul 2020 04:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.5.0-1xenial) xenial; urgency=high + + * Don't inherit requirements from exec_depends (#45 ) + * Contributors: Paul Bovbel + + -- Paul Bovbel Fri, 21 Jun 2019 04:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.4.1-1xenial) xenial; urgency=high + + * VCS support (#40 ) + * Contributors: Paul Bovbel + + -- Paul Bovbel Tue, 11 Jun 2019 04:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.4.0-1xenial) xenial; urgency=high + + * Pin pip to known-working version (#38 ) + * Fix python3 isolated builds (#37 ) + - Pull in an upstream fix to deal with new shebang styles + - add a new test for isolated py3 virtualenvs + - switch to using an internal pip module + * venv module doesn't support no-site-packages arg + * Pass arguments to internal venv module if specified (#36 ) + * Add missing dependency + * Contributors: Paul Bovbel + + -- Paul Bovbel Mon, 18 Mar 2019 04:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.3.0-1xenial) xenial; urgency=high + + * Add retry to virtualenv creation (#34 ) + * Echo check_call to stderr + * Fixup bug from #33 + * Add retry to virtualenv generation + * Add debug line for virtualenv + * Don't error on cleanup + * Fixup debug line + * Remove debug lines + * Python3 re-enable, add PYTHON_VERSION support (#33 ) + * replace PYTHON_VERSION_MAJOR with PYTHON_VERSION + * Simplify nose usage for python3 + * Check for venv module directly rather than munging major version + * Remove trailing whitespace + * Add missing dependencies + * Contributors: Paul Bovbel + + -- Paul Bovbel Wed, 16 Jan 2019 05:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.2.2-1xenial) xenial; urgency=high + + * Merge repeated requirements (#32 ) + * Enable extra_pip_args #31 from locusrobotics/add-extra-pip-args + * Contributors: Brian Barnes, Paul Bovbel, Shingo Kitagawa + + -- Paul Bovbel Tue, 04 Dec 2018 05:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.2.1-1xenial) xenial; urgency=high + + * Fix case and '.' handling + * Bump pip to 10.0.1 + * Contributors: Paul Bovbel + + -- Paul Bovbel Mon, 04 Jun 2018 04:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.2.0-1xenial) xenial; urgency=high + + * Fixup python 3 dependencies + * Merge pull request #16 from locusrobotics/system-site-packages + Provide more CMake flags to customize behaviour + * Make sure we find python exectuable + * Implement ISOLATE_REQUIREMENTS and add docs + * Make flags more flexible to support disabling system site packages + * Merge pull request #14 from locusrobotics/fix-pip + Fix issues due to pip 10 release + * Review comments + * Lock down pip version + * Make logging optional + * Contributors: Paul Bovbel + + -- Paul Bovbel Thu, 03 May 2018 04:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.1.6-1xenial) xenial; urgency=high + + * Re-enable pip upgrade + * Contributors: Paul Bovbel + + -- Paul Bovbel Wed, 10 Jan 2018 05:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.1.5-1xenial) xenial; urgency=high + + * Disable pip upgrade + * Drop strict requirements + * Update package.xml + * Contributors: Paul Bovbel + + -- Paul Bovbel Wed, 10 Jan 2018 05:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.1.4-1xenial) xenial; urgency=high + + * Fixup CMake and local directory cleanup + * Merge pull request #9 from locusrobotics/python3-compat + Python 3 compatiblity tweaks + * Add base requirements file for python3 catkin; include extra data about requirement merge failure + * Fix cmake lint errors + * Add XML schema, README badges, fix travis config for debian jessie, and remove legacy scripts + * Contributors: Paul Bovbel + + -- Paul Bovbel Sun, 03 Dec 2017 05:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.1.3-1xenial) xenial; urgency=high + + * Simplify install path + * Clean up vars + * Instantiate both a devel- and install-space venv + * Contributors: Paul Bovbel + + -- Paul Bovbel Mon, 27 Nov 2017 05:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.1.2-1xenial) xenial; urgency=high + + * Drop rosbash dependency and move python scripts into cmake directory + * More tweaks to get nosetests working in python3 + * Contributors: Paul Bovbel + + -- Paul Bovbel Thu, 23 Nov 2017 05:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.1.1-1xenial) xenial; urgency=high + + * Fixup module path + * Contributors: Paul Bovbel + + -- Paul Bovbel Wed, 22 Nov 2017 05:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.1.0-1xenial) xenial; urgency=high + + * Fix trusty support + * Contributors: Paul Bovbel + + -- Paul Bovbel Wed, 22 Nov 2017 05:00:00 -0000 + +ros-kinetic-catkin-virtualenv (0.0.1-1xenial) xenial; urgency=high + + * Add license + * Overhaul virtualenv generation and add Python 3 support (#1 ) + * Rewrite build_venv in python + * Use dh_virtualenv to do the heavy lifting; embed new version of dh_virtualenv internally + * Update CMake to generate virtualenv appropriately for install and devel space + * Initial implementation + * Contributors: Paul Bovbel + + -- Paul Bovbel Wed, 22 Nov 2017 05:00:00 -0000 + + diff --git a/debian/changelog.em b/debian/changelog.em deleted file mode 100644 index 3585909..0000000 --- a/debian/changelog.em +++ /dev/null @@ -1,7 +0,0 @@ -@[for change_version, change_date, changelog, main_name, main_email in changelogs]@(Package) (@(change_version)@(DebianInc)@(Distribution)) @(Distribution); urgency=high - -@(changelog) - - -- @(main_name) <@(main_email)> @(change_date) - -@[end for] diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/compat.em b/debian/compat.em deleted file mode 100644 index 7a87216..0000000 --- a/debian/compat.em +++ /dev/null @@ -1 +0,0 @@ -@(debhelper_version) diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..a2439a4 --- /dev/null +++ b/debian/control @@ -0,0 +1,12 @@ +Source: ros-kinetic-catkin-virtualenv +Section: misc +Priority: optional +Maintainer: Paul Bovbel +Build-Depends: debhelper (>= 9.0.0), ros-kinetic-catkin, ros-kinetic-roslint +Homepage: +Standards-Version: 3.9.2 + +Package: ros-kinetic-catkin-virtualenv +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python-dev, python3-dev, python3-nose, python3-rospkg-modules, python3-venv, ros-kinetic-rosbash, virtualenv +Description: Bundle python requirements in a catkin package via virtualenv. diff --git a/debian/control.em b/debian/control.em deleted file mode 100644 index 6d7b65c..0000000 --- a/debian/control.em +++ /dev/null @@ -1,14 +0,0 @@ -Source: @(Package) -Section: misc -Priority: optional -Maintainer: @(Maintainer) -Build-Depends: debhelper (>= @(debhelper_version).0.0), @(', '.join(BuildDepends)) -Homepage: @(Homepage) -Standards-Version: 3.9.2 - -Package: @(Package) -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, @(', '.join(Depends)) -@[if Conflicts]Conflicts: @(', '.join(Conflicts))@\n@[end if]@ -@[if Replaces]Replaces: @(', '.join(Replaces))@\n@[end if]@ -Description: @(Description) diff --git a/debian/copyright.em b/debian/copyright.em deleted file mode 100644 index a41fc55..0000000 --- a/debian/copyright.em +++ /dev/null @@ -1 +0,0 @@ -@(Copyright) \ No newline at end of file diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..0c249b1 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[git-buildpackage] +upstream-tag=release/kinetic/catkin_virtualenv/0.6.1-1 +upstream-tree=tag diff --git a/debian/gbp.conf.em b/debian/gbp.conf.em deleted file mode 100644 index ad24a16..0000000 --- a/debian/gbp.conf.em +++ /dev/null @@ -1,3 +0,0 @@ -[git-buildpackage] -upstream-tag=@(release_tag) -upstream-tree=tag diff --git a/debian/rules.em b/debian/rules similarity index 75% rename from debian/rules.em rename to debian/rules index 1c02dd4..ed022b8 100755 --- a/debian/rules.em +++ b/debian/rules @@ -13,29 +13,29 @@ export DH_VERBOSE=1 # https://code.ros.org/trac/ros/ticket/2977 # https://code.ros.org/trac/ros/ticket/3842 export LDFLAGS= -export PKG_CONFIG_PATH=@(InstallationPrefix)/lib/pkgconfig +export PKG_CONFIG_PATH=/opt/ros/kinetic/lib/pkgconfig # Explicitly enable -DNDEBUG, see: # https://github.com/ros-infrastructure/bloom/issues/327 export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG %: - dh $@@ -v --buildsystem=cmake + dh $@ -v --buildsystem=cmake override_dh_auto_configure: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \ dh_auto_configure -- \ -DCATKIN_BUILD_BINARY_PACKAGE="1" \ - -DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)" \ - -DCMAKE_PREFIX_PATH="@(InstallationPrefix)" + -DCMAKE_INSTALL_PREFIX="/opt/ros/kinetic" \ + -DCMAKE_PREFIX_PATH="/opt/ros/kinetic" override_dh_auto_build: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \ dh_auto_build override_dh_auto_test: @@ -43,19 +43,19 @@ override_dh_auto_test: # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. echo -- Running tests. Even if one of them fails the build is not canceled. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \ dh_auto_test || true override_dh_shlibdeps: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ - dh_shlibdeps -l$(CURDIR)/debian/@(Package)/@(InstallationPrefix)/lib/ + if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \ + dh_shlibdeps -l$(CURDIR)/debian/ros-kinetic-catkin-virtualenv//opt/ros/kinetic/lib/ override_dh_auto_install: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \ dh_auto_install diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/format.em b/debian/source/format.em deleted file mode 100644 index 9666bf4..0000000 --- a/debian/source/format.em +++ /dev/null @@ -1 +0,0 @@ -3.0 (@(format)) diff --git a/debian/source/options.em b/debian/source/options similarity index 81% rename from debian/source/options.em rename to debian/source/options index 8c4c78b..8bc9182 100644 --- a/debian/source/options.em +++ b/debian/source/options @@ -1,6 +1,5 @@ -@[if format and format == 'quilt']@ # Automatically add upstream changes to the quilt overlay. # http://manpages.ubuntu.com/manpages/trusty/man1/dpkg-source.1.html # This supports reusing the orig.tar.gz for debian increments. auto-commit -@[end if] +