Commit graph

42 commits

Author SHA1 Message Date
Gina Häußge
c33e9e4c85 staging is 1.3.5rc3.dev 2017-07-27 14:38:30 +02:00
Gina Häußge
c336452f6c Do not run subprocesses while intermediary server is active
Any processes inheriting the open port descriptor of that server will
cause the actual server startup to fail due to the port still being
claimed.

We can't fully prevent this under Windows thanks to fnctl not being
available and win32api being a PITA, and also close_fds on Popen not
being allowed if we also need to redirect stdout/stderr/stdin for a
process. So let's hope hardening against this problem when running
under *nix, adding a bit fat warning to never start a subprocess
during the intermediary's runtime and also moving the only actual
process we so far DID start (analysis backlog processing) to after
Tornado is running will suffice.

Fixes #2035
2017-07-27 09:58:20 +02:00
Gina Häußge
e949e0198f maintenance is now 1.3.6.dev, staging is 1.3.5rc2.dev 2017-07-26 14:24:30 +02:00
Gina Häußge
2b96e57923 maintenance & staging/maintenance are now 1.3.5(rc1) 2017-06-01 16:09:34 +02:00
Gina Häußge
9056f5d610 maintenance & staging/maintenance are now 1.3.4(rc1) 2017-05-31 16:57:10 +02:00
Gina Häußge
df038e6a4d staging/maintenance is now 1.3.3rc4.dev 2017-05-24 14:50:18 +02:00
Gina Häußge
ff89cdf6d0 Fix versioneer lookup entry for 1.3.3rc3 staging branch 2017-05-24 12:28:09 +02:00
Gina Häußge
337957198b Introducing staging/* branches for rc preparation
That way we can switch maintenance over to follow-up stable release
preparation earlier and don't have to hold back commits.
2017-05-17 13:33:28 +02:00
Gina Häußge
6465b58384 maintenance branch is now 1.3.3.dev 2017-03-16 15:18:46 +01:00
Gina Häußge
37966644aa Upped version numbers for branches 2017-01-25 12:50:50 +01:00
Gina Häußge
3caac586fc Upped version numbers for branches 2016-12-08 14:04:28 +01:00
Gina Häußge
3d959c1d5f maintenance branch is now 1.2.17.dev 2016-09-23 12:29:56 +02:00
Gina Häußge
b5bc03e711 First throw at release channels
We start out with master (Stable), rc/maintenance (Maintenance) and rc/devel (Devel)
2016-08-25 09:41:12 +02:00
Gina Häußge
fe97a8d6bd maintenance is now 1.2.16.dev 2016-07-30 09:56:49 +02:00
Gina Häußge
e76a3ea54f maintenance is now 1.2.15.dev 2016-07-28 14:30:21 +02:00
Gina Häußge
01c5b77f7b maintenance branch is now 1.2.14.dev 2016-06-16 13:14:33 +02:00
Gina Häußge
be711dd691 maintenance branch is now 1.2.13.dev 2016-06-09 12:16:27 +02:00
Gina Häußge
d3d4d4e407 Merge branch 'prerelease' into maintenance 2016-06-08 11:21:22 +02:00
Gina Häußge
e9f80c6616 Added new prerelease branch to versioneer config
Can be used in the future for tracking prereleases and testing
proper version updates without having to push to master directly.
2016-06-08 11:19:21 +02:00
Gina Häußge
34c068b964 maintenance branch is now 1.2.12.dev 2016-05-09 10:12:46 +02:00
Gina Häußge
a229cbfd49 maintenance branch is now 1.2.11.dev 2016-03-16 10:55:08 +01:00
Gina Häußge
3dd0ace076 maintenance branch is now 1.2.10.dev 2016-02-10 16:44:18 +01:00
Gina Häußge
56f2dc9d8e Make improve/... branches behave as maintenance branches
Felt too wrong to call improvements fixes all the time.
2016-02-09 17:55:29 +01:00
Gina Häußge
547dcdd725 maintenance branch is now 1.2.9.dev 2015-12-07 14:58:19 +01:00
Gina Häußge
a6c24e174d Fixed version reporting on detached HEADs
HEAD "branch" also should disable usage of lookup table.
2015-11-20 13:54:09 +01:00
Gina Häußge
528192b3c0 Fixed a merge error while migrating versioneer update 2015-10-23 09:55:14 +02:00
Gina Häußge
729d23b2c0 Fixed versioneer lookup file again
Runaway regex ;)
(cherry picked from commit 78277ac)
2015-10-23 09:54:46 +02:00
Koen Kooi
2e566c5ee1 versioneer lookup: add support for detached checkouts
When doing 'git checkout <rev>' or 'git checkout <tag>' 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 <koen@dominion.thruhere.net>
(cherry picked from commit 987e637)
2015-10-23 09:54:21 +02:00
Gina Häußge
f05f850175 Switched to new version of versioneer
Versions should now be PEP440 compatible.
(cherry picked from commit 711810d)
2015-10-23 09:53:13 +02:00
Gina Häußge
9ce9af28c3 Updating versioneer & switch to PEP440 versioning
(cherry picked from commit 137db0b)
2015-10-23 09:51:50 +02:00
Gina Häußge
adf39cdf21 maintenance branch is now 1.2.8-dev 2015-10-20 14:54:16 +02:00
Gina Häußge
a2e5fc0c5c maintenance branch is now 1.2.7-dev 2015-09-02 20:18:18 +02:00
Gina Häußge
8e28ddd6a4 Fixed versioneer lookup file again
Runaway regex ;)
(cherry picked from commit 78277ac)
2015-09-02 19:53:18 +02:00
Koen Kooi
ab8b0230bd versioneer lookup: add support for detached checkouts
When doing 'git checkout <rev>' or 'git checkout <tag>' 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 <koen@dominion.thruhere.net>
(cherry picked from commit 987e637)
2015-09-02 19:51:11 +02:00
Gina Häußge
ae4e4f22c4 maintenance branch is now 1.2.6-dev 2015-08-31 15:57:11 +02:00
Gina Häußge
1f0dbf8f7f maintenance branch is now 1.2.5-dev 2015-07-23 12:19:27 +02:00
Gina Häußge
5dfffc36e3 maintenance branch is now 1.2.4-dev 2015-07-09 09:44:51 +02:00
Gina Häußge
50a62bf00a maintenance branch is now 1.2.3-dev 2015-06-30 21:49:37 +02:00
Gina Häußge
0b3f94b6bd maintenance branch is now 1.2.2-dev 2015-06-30 10:12:14 +02:00
Gina Häußge
69e5f137a6 Devel is now 1.3
(cherry picked from commit dd5bf2e)
2015-06-25 11:03:56 +02:00
Gina Häußge
a0f2079fb5 maintenance branch is 1.2.1-dev for now
This branch is for preparing the next patch-releases of the current
stable release on the master branch.
2015-06-25 11:02:33 +02:00
Gina Häußge
212f40cd1a Modified versioneer to allow specification of manual versions based on branches
You can now define a lookup file explicitely mapping virtual version tags to branches via regular expressions and a reference commit from which the commit distance will be calculated.

Format of the file is

  <branch-regex> <tag> <reference commit>

The file is processed from top to bottom, the first matching line wins. If <tag> or <reference commit> are left out, the lookup table does not apply to the matched branches and the regular versioneer resolution (via git describe) takes place.

Current configuration makes "master", "staging" and any branch starting with "fix/" make use the default behaviour, all other branches (so basically all development branches) are defined as "1.2.0-dev"
2014-09-02 11:35:42 +02:00