From ae4e4f22c437e647ff2852f9abe93eff56d6d30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 31 Aug 2015 15:57:11 +0200 Subject: [PATCH 1/7] maintenance branch is now 1.2.6-dev --- .versioneer-lookup | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.versioneer-lookup b/.versioneer-lookup index db6d9a7b7..026490294 100644 --- a/.versioneer-lookup +++ b/.versioneer-lookup @@ -10,10 +10,10 @@ # master shall not use the lookup table, only tags master -# maintenance is currently the branch for preparation of maintenance release 1.2.5 +# maintenance is currently the branch for preparation of maintenance release 1.2.6 # so are any fix/... branches -maintenance 1.2.5-dev 9a6099ffc2982455d631c9d68a3273d9eb55885c -fix/.* 1.2.5-dev 9a6099ffc2982455d631c9d68a3273d9eb55885c +maintenance 1.2.6-dev 96fc70bdb2dd74ba04c3071f70da385b0408904a +fix/.* 1.2.6-dev 96fc70bdb2dd74ba04c3071f70da385b0408904a # every other branch is a development branch and thus gets resolved to 1.3.0-dev for now .* 1.3.0-dev 198d3450d94be1a2 From 455474841ee24e4172273dfab06c6836753f8265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 2 Sep 2015 19:38:18 +0200 Subject: [PATCH 2/7] Pinned psutil version to 3.1.1 (and all other dependencies) Something in the recently released psutil 3.2.0 version causes installations via python setup.py install to fail that list psutil as requirement. Pinning to 3.1.1 solves that problem for now. --- setup.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/setup.py b/setup.py index 5003970e8..0fed3ef0c 100644 --- a/setup.py +++ b/setup.py @@ -16,23 +16,23 @@ "flask>=0.9,<0.11", "werkzeug==0.8.3", "tornado==4.0.1", - "sockjs-tornado>=1.0.0", + "sockjs-tornado==1.0.1", "PyYAML==3.10", "Flask-Login==0.2.2", "Flask-Principal==0.3.5", "Flask-Babel==0.9", "Flask-Assets==0.10", - "pyserial", - "netaddr", - "watchdog", - "sarge>=0.1.4", - "netifaces", - "pylru", - "rsa", - "pkginfo", - "requests", - "semantic_version", - "psutil" + "pyserial==2.7", + "netaddr==0.7.17", + "watchdog==0.8.3", + "sarge==0.1.4", + "netifaces==0.8", + "pylru==1.0.9", + "rsa==3.2", + "pkginfo==1.2.1", + "requests==2.7.0", + "semantic_version==2.4.2", + "psutil==3.1.1" ] # Additional requirements for optional install options From 754ef428a0384bb52020a9753c7b179766a06ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 2 Sep 2015 19:49:49 +0200 Subject: [PATCH 3/7] Preparing release of 1.2.6 --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69ef9b242..84779d65b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # OctoPrint Changelog +## 1.2.6 (2015-09-02) + +### Bug Fixes + + * Pinned requirement for [psutil](https://pypi.python.org/pypi/psutil) + dependency to version 3.1.1 of that library due to an issue when + installing version 3.2.0 of that library released on 2015-09-02 through + a `python setup.py install` on OctoPrint. Also pinned all other requirements + to definitive versions that definitely work while at it to keep that from + happening again. + ## 1.2.5 (2015-08-31) ### Improvements From ab8b0230bd0056a03c3c2b2c2deb6296ae7e4d3a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 1 Sep 2015 08:58:57 +0200 Subject: [PATCH 4/7] versioneer lookup: add support for detached checkouts When doing 'git checkout ' or 'git checkout ' there will be no branch info: $ git branch * (detached from 96fc70b) After whitelisting '\(detached.*' we get: $ python setup.py version running version got version from git {'version': '1.2.5-1-gfd73e02', 'branch': 'HEAD', 'full': 'fd73e02f4fa9f286407ad688feeeee3ebaffea60'} Version is currently: 1.2.5-1-gfd73e02 The '-1-gfd73e02' is this commit on top of the 1.2.5 tag. While detached checkouts should be discouraged some buildsystems (e.g. OpenEmbedded) have no real way to avoid it, which is what this patch fixes. Actual people doing a checkout should use a branch. Signed-off-by: Koen Kooi (cherry picked from commit 987e637) --- .versioneer-lookup | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.versioneer-lookup b/.versioneer-lookup index 026490294..33d99b955 100644 --- a/.versioneer-lookup +++ b/.versioneer-lookup @@ -15,5 +15,8 @@ master maintenance 1.2.6-dev 96fc70bdb2dd74ba04c3071f70da385b0408904a fix/.* 1.2.6-dev 96fc70bdb2dd74ba04c3071f70da385b0408904a +# Special case disconnected checkouts, e.g. 'git checkout ' +(detached.* + # every other branch is a development branch and thus gets resolved to 1.3.0-dev for now .* 1.3.0-dev 198d3450d94be1a2 From 8e28ddd6a4c4a68871a3280e6598bbbec31b7e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 2 Sep 2015 10:03:39 +0200 Subject: [PATCH 5/7] Fixed versioneer lookup file again Runaway regex ;) (cherry picked from commit 78277ac) --- .versioneer-lookup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.versioneer-lookup b/.versioneer-lookup index 33d99b955..9174f0ca6 100644 --- a/.versioneer-lookup +++ b/.versioneer-lookup @@ -16,7 +16,7 @@ maintenance 1.2.6-dev 96fc70bdb2dd74ba04c3071f70da385b0408904a fix/.* 1.2.6-dev 96fc70bdb2dd74ba04c3071f70da385b0408904a # Special case disconnected checkouts, e.g. 'git checkout ' -(detached.* +\(detached.* # every other branch is a development branch and thus gets resolved to 1.3.0-dev for now .* 1.3.0-dev 198d3450d94be1a2 From ef46a494302230f74c9ce01918c6fd94c943bcf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 2 Sep 2015 19:55:24 +0200 Subject: [PATCH 6/7] Also included #1041 in 1.2.6 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84779d65b..571e487d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## 1.2.6 (2015-09-02) +### Improvement + + * Added support for version reporting on detached checkouts + (see [#1041](https://github.com/foosel/OctoPrint/pull/1041)) + ### Bug Fixes * Pinned requirement for [psutil](https://pypi.python.org/pypi/psutil) From 536bb31965db17b969e7c1c53e241ddac4ae1814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 2 Sep 2015 19:59:38 +0200 Subject: [PATCH 7/7] Forgot the commit link in the changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 571e487d2..541f25515 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 1.2.6 (2015-09-02) -### Improvement +### Improvements * Added support for version reporting on detached checkouts (see [#1041](https://github.com/foosel/OctoPrint/pull/1041)) @@ -16,6 +16,8 @@ to definitive versions that definitely work while at it to keep that from happening again. +([Commits](https://github.com/foosel/OctoPrint/compare/1.2.5...1.2.6)) + ## 1.2.5 (2015-08-31) ### Improvements