diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 9f54f36..dfe9d14 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -66,3 +66,27 @@ To test on your local machine you can call make install, with checkinstall insta To release make sure that the version number in src/rosinstall/__version__.py and that the doc/changelog.rst are updated. +* Upgrade vcstools/wstool dependency version in `setup.py` +* Update `src/vcstools/__version__.py` +* Check `doc/changelog` is up to date +* Check `stdeb.cfg` is up to date with OSRF buildfarm distros +* prepare release dependencies:: + + pip install --upgrade setuptools wheel twine + +* Upload to testpypi:: + + python3 setup.py sdist bdist_wheel + twine upload --repository testpypi dist/* + +* Check testpypi download files and documentation look ok +* Actually release:: + + twine upload dist/* + +* Create and push tag:: + + git tag x.y.z + git push + git push --tags + diff --git a/doc/changelog.rst b/doc/changelog.rst index 889776f..eec1ff7 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -1,6 +1,23 @@ Changelog ========= +0.7.9 +----- + +- using pyyaml safe_load to avoid warning messages +- upgrade vcstools library version to 0.1.41, with new fixes: + + - fix git submodule errors + - fix export_upstream for git submodules + - fix python3 incompatibility + - fix git fast-forward failures + - fix get_affected_files + +0.7.8 +----- + +- Maintenance release + 0.7.7 ----- diff --git a/requirements.txt b/requirements.txt index b27a0cf..609f7de 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -vcstools>=0.1.38 +vcstools>=0.1.42 pyyaml diff --git a/setup.py b/setup.py index bc9ad64..5a000ae 100644 --- a/setup.py +++ b/setup.py @@ -34,11 +34,11 @@ def get_version(): packages=['rosinstall'], package_dir={'': 'src'}, install_requires=[ - 'vcstools>=0.1.38', + 'vcstools>=0.1.42', 'pyyaml', 'rosdistro>=0.3.0', 'catkin_pkg', - 'wstool>=0.1.14', + 'wstool>=0.1.18', 'rospkg' ], tests_require=test_required, diff --git a/src/rosinstall/__version__.py b/src/rosinstall/__version__.py index a83c69d..bebdf7d 100644 --- a/src/rosinstall/__version__.py +++ b/src/rosinstall/__version__.py @@ -1 +1 @@ -version = '0.7.8' +version = '0.7.9' diff --git a/stdeb.cfg b/stdeb.cfg index 357ec4b..c4ad3cb 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -3,5 +3,5 @@ Depends: subversion, mercurial, git-core, bzr, python-yaml, python-vcstools (>= Depends3: subversion, mercurial, git-core, bzr, python3-yaml, python3-vcstools (>= 0.1.38), python3-catkin-pkg, python3-rosdistro (>=0.3.0), python3-wstool (>=0.1.14), python3-rospkg Conflicts: python3-rosinstall Conflicts3: python-rosinstall -Suite: oneiric precise quantal raring saucy trusty utopic vivid wily xenial yakkety zesty artful bionic cosmic disco wheezy jessie stretch buster +Suite: oneiric precise quantal raring saucy trusty utopic vivid wily xenial yakkety zesty artful bionic wheezy jessie stretch buster X-Python3-Version: >= 3.2