Skip to content

Commit

Permalink
Generated debian files for xenial
Browse files Browse the repository at this point in the history
  • Loading branch information
paulbovbel committed Aug 24, 2020
1 parent 2722d84 commit 030ec5a
Show file tree
Hide file tree
Showing 13 changed files with 254 additions and 39 deletions.
226 changes: 226 additions & 0 deletions debian/changelog
@@ -0,0 +1,226 @@
ros-kinetic-catkin-virtualenv (0.6.1-1xenial) xenial; urgency=high

* Correct dependencies and autoformat (#72 <https://github.com/locusrobotics/catkin_virtualenv/issues/72>)
* Remove python-virtualenv dep
* Add python2-dev
* Lint
* We're ok with any 44.x version of setuptools (#71 <https://github.com/locusrobotics/catkin_virtualenv/issues/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 <pbovbel@locusrobotics.com> 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 <https://github.com/locusrobotics/catkin_virtualenv/issues/67>)
* Revert "Downgrade docutils so that boto works (#66 <https://github.com/locusrobotics/catkin_virtualenv/issues/66>)"
This reverts commit 998cd6add2e43e12036d0db15a7c4d58fe3411cf.
* Downgrade docutils so that boto works (#66 <https://github.com/locusrobotics/catkin_virtualenv/issues/66>)
See https://github.com/boto/botocore/issues/1942 and related threads.
* Make regex for Python bytecode more selective (#65 <https://github.com/locusrobotics/catkin_virtualenv/issues/65>)
Fix regex to match only files ending in ".py[co]" and not files ending
in "py[co]".
* Remove user specific paths (#63 <https://github.com/locusrobotics/catkin_virtualenv/issues/63>)
* Remove user specific paths
* Change working directory of venv_lock command
* Lock catkin_virtualenv base requirements
Co-authored-by: Paul Bovbel <mailto:paul@bovbel.com>
* RST-3172 Check that requirements file is locked (#62 <https://github.com/locusrobotics/catkin_virtualenv/issues/62>)
* Two helpful hints (#61 <https://github.com/locusrobotics/catkin_virtualenv/issues/61>)
* Fix input requirements warning (#58 <https://github.com/locusrobotics/catkin_virtualenv/issues/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 <mailto:ablakey@gmail.com>
Co-authored-by: Andrew Blakey <mailto:ablakey@gmail.com>
* Preserve symlinks during copy (#57 <https://github.com/locusrobotics/catkin_virtualenv/issues/57>)
* Don't ignore unknown args
* RST-3172 Refactor catkin_virtualenv to allow locking dependencies (#55 <https://github.com/locusrobotics/catkin_virtualenv/issues/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 <https://github.com/locusrobotics/catkin_virtualenv/issues/51>)
* First python2 issue of 2020 (#49 <https://github.com/locusrobotics/catkin_virtualenv/issues/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 <https://github.com/locusrobotics/catkin_virtualenv/issues/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 <pbovbel@locusrobotics.com> 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 <https://github.com/locusrobotics/catkin_virtualenv/issues/45>)
* Contributors: Paul Bovbel

-- Paul Bovbel <pbovbel@locusrobotics.com> Fri, 21 Jun 2019 04:00:00 -0000

ros-kinetic-catkin-virtualenv (0.4.1-1xenial) xenial; urgency=high

* VCS support (#40 <https://github.com/locusrobotics/catkin_virtualenv/issues/40>)
* Contributors: Paul Bovbel

-- Paul Bovbel <pbovbel@locusrobotics.com> 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 <https://github.com/locusrobotics/catkin_virtualenv/issues/38>)
* Fix python3 isolated builds (#37 <https://github.com/locusrobotics/catkin_virtualenv/issues/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 <https://github.com/locusrobotics/catkin_virtualenv/issues/36>)
* Add missing dependency
* Contributors: Paul Bovbel

-- Paul Bovbel <pbovbel@locusrobotics.com> 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 <https://github.com/locusrobotics/catkin_virtualenv/issues/34>)
* Echo check_call to stderr
* Fixup bug from #33 <https://github.com/locusrobotics/catkin_virtualenv/issues/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 <https://github.com/locusrobotics/catkin_virtualenv/issues/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 <pbovbel@locusrobotics.com> Wed, 16 Jan 2019 05:00:00 -0000

ros-kinetic-catkin-virtualenv (0.2.2-1xenial) xenial; urgency=high

* Merge repeated requirements (#32 <https://github.com/locusrobotics/catkin_virtualenv/issues/32>)
* Enable extra_pip_args #31 <https://github.com/locusrobotics/catkin_virtualenv/issues/31> from locusrobotics/add-extra-pip-args
* Contributors: Brian Barnes, Paul Bovbel, Shingo Kitagawa

-- Paul Bovbel <pbovbel@locusrobotics.com> 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 <pbovbel@locusrobotics.com> 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 <https://github.com/locusrobotics/catkin_virtualenv/issues/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 <https://github.com/locusrobotics/catkin_virtualenv/issues/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 <pbovbel@locusrobotics.com> 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 <pbovbel@locusrobotics.com> 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 <pbovbel@locusrobotics.com> 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 <https://github.com/locusrobotics/catkin_virtualenv/issues/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 <pbovbel@locusrobotics.com> 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 <pbovbel@locusrobotics.com> 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 <pbovbel@locusrobotics.com> 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 <pbovbel@locusrobotics.com> 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 <pbovbel@locusrobotics.com> 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 <https://github.com/locusrobotics/catkin_virtualenv/issues/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 <pbovbel@locusrobotics.com> Wed, 22 Nov 2017 05:00:00 -0000


7 changes: 0 additions & 7 deletions debian/changelog.em

This file was deleted.

1 change: 1 addition & 0 deletions debian/compat
@@ -0,0 +1 @@
9
1 change: 0 additions & 1 deletion debian/compat.em

This file was deleted.

12 changes: 12 additions & 0 deletions debian/control
@@ -0,0 +1,12 @@
Source: ros-kinetic-catkin-virtualenv
Section: misc
Priority: optional
Maintainer: Paul Bovbel <pbovbel@locusrobotics.com>
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.
14 changes: 0 additions & 14 deletions debian/control.em

This file was deleted.

1 change: 0 additions & 1 deletion debian/copyright.em

This file was deleted.

3 changes: 3 additions & 0 deletions debian/gbp.conf
@@ -0,0 +1,3 @@
[git-buildpackage]
upstream-tag=release/kinetic/catkin_virtualenv/0.6.1-1
upstream-tree=tag
3 changes: 0 additions & 3 deletions debian/gbp.conf.em

This file was deleted.

20 changes: 10 additions & 10 deletions debian/rules.em → debian/rules
Expand Up @@ -13,49 +13,49 @@ 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:
# 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.
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
1 change: 1 addition & 0 deletions debian/source/format
@@ -0,0 +1 @@
3.0 (quilt)
1 change: 0 additions & 1 deletion debian/source/format.em

This file was deleted.

3 changes: 1 addition & 2 deletions debian/source/options.em → 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]

0 comments on commit 030ec5a

Please sign in to comment.