Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Updates to support st2 packaging #1917

Merged
merged 61 commits into from
Sep 5, 2015
Merged
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
036177d
added requirements.txt for specific components
dennybaa Jun 17, 2015
93a1baa
setup.py new requirements idea
dennybaa Jun 17, 2015
2aa212b
Merge branch 'master' of github.com:StackStorm/st2
dennybaa Jul 1, 2015
51c7b4e
Merge branch 'master' of github.com:StackStorm/st2
dennybaa Jul 30, 2015
406803e
Merge branch 'master' of github.com:StackStorm/st2
dennybaa Aug 28, 2015
6fa1e03
requirements removed, in-requirements introduced for each of the comp…
dennybaa Aug 31, 2015
80fbf65
makefiles update
dennybaa Aug 31, 2015
70790e1
clean out st2reactor/requirement.txt
dennybaa Aug 31, 2015
ee73d44
setup.py and manifests update
dennybaa Aug 31, 2015
1e2c722
a few new scripts and files
dennybaa Aug 31, 2015
f2508d2
renamed script
dennybaa Aug 31, 2015
b8fb264
fixed egg naming
dennybaa Aug 31, 2015
286e6d2
Merge branch 'master' into updates_for_st2_packaging
Kami Aug 31, 2015
cfa574e
Add some docs on managing Python requirements.
Kami Jun 30, 2015
c36eeb9
Make script executable.
Kami Aug 31, 2015
25e0fff
Fix version check, 6.1 is required.
Kami Aug 31, 2015
cd992e9
Remove duplicated -r flag, it's already defined in PIP_OPTIONS.
Kami Aug 31, 2015
4a62380
Make sure pip is updated before we fixate requirements.
Kami Aug 31, 2015
b074b3b
Update .gitignore - we want requirements.txt file included since it's…
Kami Aug 31, 2015
09990db
Add re-generated requirements file back.
Kami Aug 31, 2015
78f828e
Update fixate-requirements.txt to throw on duplicate requirement defi…
Kami Aug 31, 2015
e349c5f
Remove duplicate requirement definitions.
Kami Aug 31, 2015
1a74f67
Fix a regression - make sure test requirements are also installed.
Kami Aug 31, 2015
0b96c61
Move -r flag outside pip options.
Kami Aug 31, 2015
8310de1
Add missing in-requirements.txt for st2debug package.
Kami Sep 1, 2015
f810159
Add missing version pins for oslo.config, pyyaml and requests.
Kami Sep 1, 2015
b75d065
Include re-generated requirements.txt.
Kami Sep 1, 2015
179837d
Add missing in-requirements.txt to st2exporter.
Kami Sep 1, 2015
308317c
Make sure we use latest version of pip on travis.
Kami Sep 1, 2015
0790f64
Add back license, classifiers and description to st2client setup.py.
Kami Sep 1, 2015
72cdfde
integration test tasks run as root so we also need to upgrade pip there.
Kami Sep 1, 2015
ef2f2ad
Flat file package is a dependency of st2auth, not st2common.
Kami Sep 1, 2015
7879e99
Pin paramiko, re-generate requirements.
Kami Sep 1, 2015
f7e345a
Add missing manifest.in to st2debug and st2exporter, update other man…
Kami Sep 1, 2015
18b3931
Update .gitignore - we do want to include requirements.txt in st2clie…
Kami Sep 1, 2015
9697d1b
Include generated st2client requirements.txt file.
Kami Sep 1, 2015
2c055d6
Make sure we fetch the requirements from the correct, component local…
Kami Sep 1, 2015
a10f6ae
Try using setup.py install instead of develop.
Kami Sep 1, 2015
73bd62c
Try using latest version of setuptools.
Kami Sep 1, 2015
0e2efe0
Try using a venv instead.
Kami Sep 1, 2015
0981ae7
Also ignore egg-info dir created during build.
Kami Sep 1, 2015
fd30ca3
runners.sh support for sysv, systemd, upstart platforms
dennybaa Sep 2, 2015
d0c505b
runners.sh make a destinction between script failure and daemons star…
dennybaa Sep 2, 2015
ffb2b04
pyyaml is only required by st2client tests, not the client itself.
Kami Sep 2, 2015
1ef5c30
Merge branch 'updates_for_st2_packaging' of github.com:StackStorm/sta…
Kami Sep 2, 2015
f427653
ckport vagrant workaround from #1677 and re-use dist_utils.py instead of
Kami Sep 2, 2015
fb85aa0
Fix setup.py - we need to explicitly specify package name.
Kami Sep 2, 2015
2a07b72
Add missing file.
Kami Sep 2, 2015
c1ae458
pyyaml is only required by st2client tests, not the client itself.
Kami Sep 2, 2015
8582e5c
ckport vagrant workaround from #1677 and re-use dist_utils.py instead of
Kami Sep 2, 2015
26fb300
Fix setup.py - we need to explicitly specify package name.
Kami Sep 2, 2015
1abdb2a
a few more fixes in runners.sh
dennybaa Sep 2, 2015
01ee1c7
Merge branch 'updates_for_st2_packaging' of github.com:StackStorm/st2…
dennybaa Sep 2, 2015
6415af0
Merge branch 'updates_for_st2_packaging' of github.com:StackStorm/st2…
dennybaa Sep 2, 2015
52ed773
Add missing file.
Kami Sep 2, 2015
bed46ee
Merge branch 'updates_for_st2_packaging' of github.com:StackStorm/st2…
dennybaa Sep 2, 2015
5d60e85
Update st2debug setup.py and Makefile file so it's in line with others.
Kami Sep 2, 2015
f93ff50
Add setup.py and Makefile to st2exporter.
Kami Sep 2, 2015
10db28e
Update .gitignore.
Kami Sep 2, 2015
6337482
Merge branch 'updates_for_st2_packaging' of github.com:StackStorm/sta…
Kami Sep 2, 2015
095d4b8
Merge branch 'master' into updates_for_st2_packaging
Kami Sep 4, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion st2actions/bin/runners.sh
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ WORKERSVC=st2actionrunner-worker
if [ -x $SYSTEMDCTL ]; then
sv=systemd
svbin=$SYSTEMDCTL
elif ( /sbin/start 2>/dev/null | grep -q "missing job name" ); then
elif ( /sbin/start 2>&1 | grep -q "missing job name" ); then
sv=upstart
svbin=$UPSTARTCTL
else