valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
43,598 Commits 24 Branches 182 Tags 341 MiB
bda4eae9d0
Commit Graph

253 Commits

Author SHA1 Message Date
Niels Abspoel
7eeb8c6e20 fix for issue #7436 no templates in salt 
One line in setup.py that says salt.templates package should be build.
 2013-09-26 23:39:00 +02:00
Thomas S Hatch
1a3e1b0350 Add doc directory to clean routine 2013-09-26 10:44:14 -06:00
Pedro Algarvio
528ee3ae14 salt.utils.decorators is now a package. 2013-09-24 22:08:08 +01:00
Henrik Holmboe
8960189d22 Move jinja template files into salt/templates 
See #7291. This is the first step.
 2013-09-24 17:04:41 +02:00
Niels Abspoel
a655aa534c fix missing man page for salt-ssh fixes #7042 2013-09-19 21:14:38 +02:00
Henrik Holmboe
a8779ac96d Upcase constant 2013-09-19 12:42:09 +02:00
Thomas S Hatch
ff31ed9404 Add wrapper pkg to setup.py 2013-09-01 21:30:37 -06:00
Pedro Algarvio
3f31b06a5d salt.log.handlers is a package now. 2013-08-30 19:32:39 +00:00
Pedro Algarvio
08d5791f10 salt.log is now a package instead of a module. 
The necessary changes were made to assure backwards compatibility.
 2013-08-30 19:32:38 +00:00
mickey
f79e2b2bb9 Removed salt.ssh from the packages as it was moved to salt.client.ssh 2013-08-30 06:24:32 -05:00
Thomas S Hatch
0f458d7df5 include salt.client.ssh in setup.py 2013-08-29 17:00:24 -06:00
Pedro Algarvio
eb1db5c010 Store salt related path configurations in the distribution object. Fixes #6906. 
Added `srv_root_dir` to the paths to check.
 2013-08-27 08:46:26 +00:00
Pedro Algarvio
9a4ce0ea9d No more hard-coded salt paths. 
All system paths that salt expects and needs are all configurable at install time. This allows for packagers to setup salt's **default** internal paths at build time. For example, under windows, the configuration directory is expected at `c:\salt\conf\`, on FreeBSD at `/usr/local/etc/salt`, etc.

The configurable paths are:

* Salt root directory, `salt_root` in the master and minion configuration files, `--salt-root-dir` option to `python setup.py install`.  Default: `/`
* Salt configuration directory, `--salt-config-dir` option to `python setup.py install`.  Default: `/etc/salt`
* Salt cache directory, `--salt-cache-dir` option to `python setup.py install`.  Default: `/var/cache/salt`
* Salt sock directory, `--salt-sock-dir` option to `python setup.py install`.  Default: `/var/run/salt`
* Salt services root directory, `--salt-srv-root-dir` option to `python setup.py install`.  Default: `/srv`
* Salt base file roots directory, `--salt-base-file-roots-dir` option to `python setup.py install`.  Default: `/srv/salt`
* Salt base pillar roots directory, `--salt-base-pillar-roots-dir` option to `python setup.py install`.  Default: `/srv/pillar`
* Salt base master roots directory, `--salt-base-master-roots-dir` option to `python setup.py install`.  Default: `/srv/salt-master`
* Salt logs directory, `--salt-logs-dir` option to `python setup.py install`.  Default: `/var/log/salt`
* Salt pidfile directory, `--salt-pidfile-dir` option to `python setup.py install`.  Default: `/var/run`
 2013-08-25 22:55:57 +00:00
Pedro Algarvio
0288ae6046 Allow salt's paths to be configurable at build time. 2013-08-23 23:58:26 +01:00
Pedro Algarvio
10e635c4d2 Make pylint happy, global variables are all uppercased. 2013-08-23 23:17:13 +01:00
Pedro Algarvio
7f85966cf5 Remove unnecessary variables. 
Somewhere along the way salt's setup changed and some variable were left around. Let's remove them.
 2013-08-23 23:09:23 +01:00
Thomas S Hatch
363e6a383e Add salt.client to packages 2013-08-08 12:43:06 -06:00
Thomas S Hatch
d1e9d78fd6 Ass salt-ssh into setup.py 2013-07-01 15:52:46 -06:00
Pedro Algarvio
e7c07c8e55 The tests require setup settings can only be addded if setuptools is in use. 2013-06-28 00:12:58 +01:00
Pedro Algarvio
6456934cba Fix the tests require entry in setup. 2013-06-28 00:12:58 +01:00
Pedro Algarvio
3ee3a4796b The salt-testing project changed ownership. Update references. 2013-06-28 00:12:58 +01:00
Pedro Algarvio
3550397b0c Add tests_require to the setup arguments. 2013-06-28 00:12:58 +01:00
Pedro Algarvio
6996afaf46 Work around __file__ NameError thrown by bbfreeze. Fixes #5172. 2013-05-22 02:00:44 +01:00
Pedro Algarvio
0aeb2af20f Add yum to freezer includes if we can actually freeze it, ie, is it available? 2013-05-22 00:45:54 +01:00
Pedro Algarvio
39631427b4 Double to single quotes. 2013-05-22 00:36:31 +01:00
David Boucha
bc83269e41 freeze numbers 2013-05-15 10:16:43 -06:00
Zoran Simic
7d5441e294 Better fix for 'pip' detection in setup.py 2013-03-20 14:05:20 -07:00
Thomas S Hatch
dc2fa7f7ea Remove esky errors because they only confuse %99.99 of users 2013-03-18 14:20:00 -06:00
Pedro Algarvio
52baa13a6d Bring to the developer's attention that a version bump might be missing. 2013-03-14 03:36:50 +00:00
Morgan Fainberg
b9adf48819 Lingering comment removal 2013-02-24 23:29:45 -08:00
Morgan Fainberg
512d9adb8b Fix for "pip" detection so that setuptools is used 
If setuptools is not used for PIP installs pip fails to install salt
with a rather nasty error:

error: option --single-version-externally-managed not recognized

from what I can dig up the simple use of:
    if "pip" in __file__

is sufficient to detect pip usage, and should be synonomous
with USE_SETUPTOOLS
 2013-02-24 23:19:00 -08:00
Svetlana Shturm
6dac3120a8 Import install command from setuptools if we use them. 
This commit fixes bug with option --single-version-externally-managed.
 2013-02-13 14:53:39 +04:00
Pedro Algarvio
5730b0bf42 Generate salt._version when installing so we can have the git describe information. Fixes #2587. 2013-02-06 04:23:56 +00:00
anatoly techtonik
f617888bb4 Fix easy_install'ation on Windows 
There is no 'wmi' package on PyPI.
 2013-02-04 01:14:57 +03:00
Wendall Cada
2ac61215ba Replace hardcoded python executable with sys.executable 2013-01-17 17:05:45 -08:00
Pedro Algarvio
0f5386cb35 Filter Unknown distribution option's when not installing with setuptools. 2013-01-14 13:41:42 +00:00
Aaron Tygart
b50cd76a25 Refine esky support in setup.py 
* Add HAS_ESKY flag based on import tests rather than command line
  arguments.
* Add comments on reasoning for some setup kwargs
* Fix append bug for wmi dependency
* Revert part of e70d70aa75. Esky uses
  those kwargs regardless of the distribution stack used.
* Remove unused 'libraries' variable
 2013-01-01 16:49:26 -06:00
Pedro Algarvio
3363c43495 Only change to setup.py if not already there. 2012-12-30 18:03:02 +00:00
Pedro Algarvio
e37da07241 Allow running setup.py from any directory. 2012-12-30 17:55:23 +00:00
Thomas S Hatch
13192bbf66 Add fileserver modules to setup.py 2012-12-27 14:09:26 -07:00
Thomas S Hatch
a24de1abb2 Merge pull request #2798 from brutasse/fix/fpm 
Filtered the content of requirements.txt
 2012-12-04 08:16:49 -08:00
Bruno Renié
aa416583ae Removed the check for comments in requirements parsing 2012-12-04 15:49:40 +01:00
Bruno Renié
c03c83b269 Filtered the content of requirements.txt 
This sanitizes what goes into install_requires. External packaging tools such
as FPM fail when they see a requirement starting with '#'.
 2012-12-04 15:18:24 +01:00
Pedro Algarvio
e70d70aa75 Minor PEP-8. Remove non supported distutils options from setup_kwargs if not using setuptools. 2012-11-26 03:06:25 +00:00
Thomas S Hatch
473a789e7d Add search to setup.py 2012-11-20 22:44:04 -07:00
Aaron Tygart
63fab92ed6 Fix missing freezer_includes for esky 2012-11-14 16:24:15 -06:00
Thomas S Hatch
6d8ed212ec Add wheel to setup.py 2012-10-26 10:06:15 -06:00
Thomas S Hatch
57b88165ad Add output package to setup.py 2012-10-24 16:26:48 -06:00
Pedro Algarvio
3f6d79884f Extend setuptools clean command to remove compiled python files. 2012-10-12 15:51:28 +01:00
Aaron Tygart
9efaa97ad7 Rework some Windows grains to use WMI 2012-10-05 15:40:21 -05:00
Thomas S Hatch
f75427b13e Add tops package to setup.py 2012-10-03 14:04:41 -06:00
Thomas S Hatch
dca280a232 Add auth package to setup.py 2012-10-03 13:57:36 -06:00
Pedro Algarvio
42c375cbd9 Allow passing options to tests/runtests.py from python setup.py test. 2012-09-29 19:41:21 +01:00
Aaron Tygart
100a6c2c2e Add 'distutils.version' to bbfreeze includes. 2012-09-23 13:43:39 -05:00
Aaron Tygart
44234ff2bd Add ifmain to make setup.py import safe 2012-09-23 00:19:39 -05:00
Aaron Tygart
876fb9ec4e Add difflib and distribute to bbfreeze includes 2012-09-19 20:35:14 -05:00
Aaron Tygart
5aee1e7ad9 Add windows support for open file count 2012-09-19 18:06:07 -05:00
Aaron Tygart
0012024c63 Add additional modules for freezing on windows 2012-09-18 15:35:38 -05:00
Aaron Tygart
98d8ed8723 Add bdist_esky command to setup.py 
* Add bdist_esky command through import from esky
* Add list of explicit includes with platform detection
* Update salt build to be zip unsafe
 2012-09-10 13:32:34 -05:00
Seth House
3791d3ba0a Added path checking to setup.py 2012-07-15 11:18:38 -07:00
Seth House
6e7afc0d0e Changed setuptools opt-in to be more explicit; added a quick explanation 2012-07-15 11:18:38 -07:00
Seth House
983ef87626 Change setup.py shebang to point to python instead of python2 2012-07-15 11:18:38 -07:00
Intchanter
f663dd2c46 Merge branch 'develop' of https://github.com/saltstack/salt into develop 
Conflicts:
	salt/states/network.py
	setup.py
	tests/integration/__init__.py
 2012-07-08 22:50:12 -06:00
Thomas S Hatch
4b5474db19 Add new pillar loader directory to setup.py 2012-07-07 23:57:08 -06:00
Intchanter
3c05a3ee78 Merge branch 'develop' of https://github.com/saltstack/salt into develop 
Conflicts:
	tests/integration/modules/grains.py
	tests/integration/states/host.py
	tests/unit/utils/find_test.py
 2012-07-04 18:29:13 -06:00
Intchanter
66b2e4988c PEP8 for packaging 2012-06-30 14:35:31 -06:00
David Boucha
7d89ee3783 import setuptools if SETUPTOOLS env var exists 
Default to importing distutils unless the user
has created an environment variable named
SETUPTOOLS in which case import setuptools
 2012-06-30 14:01:57 -06:00
Baiju Muthukadan
e350edd2a0 remove unused imports 2012-06-09 21:46:02 +05:30
Benoit Bryon
ee0072d3e8 Updated setup(): use setuptools' console_scripts if available, else fallback to distutils' scripts. Refs #1028. 2012-06-05 12:00:20 +02:00
Thomas S Hatch
d2ccea1991 Merge pull request #1221 from 0xDEC0DE/develop 
setup.py falls down, goes boom when building package for Debian Squeeze
 2012-05-06 21:21:31 -07:00
Nicolas Simonds
328486caa6 setup.py falls down, does boom when building package for Debian Squeeze 2012-05-06 20:25:14 -07:00
Baiju Muthukadan
763a4287cf Exit testrunner with proper exit code 2012-05-05 17:23:39 +05:30
Jeff Hutchins
f433c136ba Rename rh_network folder to rh_ip 2012-04-25 10:35:48 -06:00
Jeff Hutchins
3b69d3c557 Fix setup so it will actually install templates 2012-04-25 10:15:22 -06:00
Jeff Hutchins
418c161aaa Add package data to the setup 2012-04-25 10:06:13 -06:00
Monty Taylor
12fd1315f8 Add tox config. 
Add a config file for tox to enable running salt tests in a set of
virtualenvs for different versions of python. Add stanzas to allow
for running tests against 2.6, 2.7 and 3.2.

First step - pip install tox. Then, to run tests in a virtualenv
against all three, simply type:

tox

If you want to  run against just one, try:

tox -epy26

And if you want to see more, do:

tox -v -epy26
 2012-04-20 13:19:39 -07:00
Thomas S Hatch
8539ac1746 remove creation of files in /etc 2012-03-21 12:10:46 -06:00
Dan Colish
eae7bea4f6 Add requirements.txt to sdist and allow setup.py to use setuptools if detected in environment 2012-03-01 16:17:03 -08:00
Seth House
4b14811779 Revert "Merge pull request #548 from Lanzaa/develop" 
This reverts commit 8fdf7dbfbc, reversing
changes made to ad3f74c2c7.

Salt is back to platform independent now that msgpack is out. :-P
 2012-01-21 21:39:39 -07:00
Thomas S Hatch
7b16bc18be take msgpack out of the setup.py 2012-01-20 19:30:57 -07:00
Thomas S Hatch
532d868fa5 add docs files to the tarball 2012-01-20 10:22:21 -07:00
Thomas S Hatch
22894b373b remove cytest from setup.py 2012-01-20 09:37:46 -07:00
Colin B.
21d757ba73 Salt is now platform dependent. Use get_python_lib(1) 2012-01-19 14:01:53 -08:00
Jeff Bauer
94a8b927de added salt/config.py, setup.py changes 2012-01-16 13:36:39 -06:00
Seth House
204414ff91 Moved version info to own file to avoid import issues 
Fixes issue #387.
 2012-01-04 16:14:24 -07:00
Thomas S Hatch
dd83dfad98 fix setting python to python2 2011-12-30 20:50:15 -07:00
Martin Schnabel
43a6bcf299 add simple test runner. 
use:
   python setup.py test
to build salt and run all 'unittest.TestCase's in tests/
 2011-12-30 00:55:05 +01:00
Corey Quinn
0c377230ad Fixed lintian errors on package build 2011-12-26 16:34:06 -08:00
Thomas S Hatch
f00237a8e2 fix a version issue 2011-12-10 14:47:06 -07:00
Thomas S Hatch
57d9bb8feb ref the right version mod 2011-12-10 14:34:42 -07:00
Thomas S Hatch
fb42253e7e fix version loading issue with cython 2011-12-10 14:33:57 -07:00
Thomas S Hatch
0d666254d9 Add msgpack to the main application 2011-12-10 13:12:16 -07:00
Thomas S Hatch
12401d6817 change homepage to saltstack 2011-11-27 22:05:18 -07:00
Thomas S Hatch
be50ce0e52 remove deprecated state examples 2011-11-27 16:03:35 -07:00
Thomas S Hatch
04c7bbfaaa remove cython build dep 2011-11-23 09:43:29 -07:00
Markus Gattol
38e5d2b2cb file permissions: from 775 to 755 
Signed-off-by: Markus Gattol <markus.gattol@sunoano.org>
 2011-11-14 15:49:06 +00:00
Markus Gattol
d018ae29a5 make pep8 happy and be more pythonic 
Signed-off-by: Markus Gattol <markus.gattol@sunoano.org>
 2011-11-09 14:12:15 +00:00
Markus Gattol
fdb429d60c we also run just fine on 2.7 
Signed-off-by: Markus Gattol <markus.gattol@sunoano.org>
 2011-11-09 12:28:22 +00:00
Markus Gattol
b870dd74e7 we are targeting 2.6+ for now 
Signed-off-by: Markus Gattol <markus.gattol@sunoano.org>
 2011-11-09 11:57:51 +00:00
Thomas S Hatch
c7b4317b52 trailing slashes here breaks windows compatability 2011-10-24 16:13:47 -06:00
Seth House
02a3dab489 Moved the version string to the Salt module 
This move will allow fetching the verison from multiple places such as
setup.py as well as the docs.
 2011-09-25 00:30:36 -06:00
Thomas S Hatch
62575c03ec bump to 0.9.2 2011-09-17 12:51:17 -06:00
Thomas S Hatch
b956e7f7df bump version to 0.9.1 2011-08-29 18:45:20 -06:00
Thomas S Hatch
faafda688c update clasifier to production/stable 2011-08-27 12:50:26 -06:00
Thomas S Hatch
7e7b47effb Add salt-syndic manpage to setup.py 2011-08-27 11:32:54 -06:00
Thomas S Hatch
aa527369dc move setup.py to 0.9.0 2011-08-27 11:12:37 -06:00
Thomas S Hatch
65f0c35855 remove precompiled pyx modules 2011-08-26 22:50:42 -06:00
Erik Nolte
86213377df Move salt-monitor scripts and packaging to salt-monitor project 2011-08-10 11:20:33 -06:00
Thomas S Hatch
3b8e568ed9 Add cytest to bin packages 2011-08-02 23:05:52 -06:00
Thomas S Hatch
3a6f011107 change salt to be binary! This change makes cython modules buildable 
with the setup.py, time to start moving core salt modules to cython!
 2011-08-02 23:02:00 -06:00
Thomas S Hatch
c06097b3ef Add syndic script to the setup 2011-07-30 22:24:08 -06:00
Thomas S Hatch
0f7d91a16a Add the new utils package to the setup.py 2011-07-29 21:40:21 -06:00
Erik Nolte
34811e045c Use American LICENSE spelling 2011-07-27 19:30:30 -06:00
Erik Nolte
7d5f246dd5 Add salt-monitor to the scripts distributed. 2011-07-27 19:19:38 -06:00
Erik Nolte
74fab8b706 Separate the salt minion from the salt monitor by creating the salt-monitor standalone command. 
Run 'salt-monitor' rather than 'salt-minion' to start the monitor.
 2011-07-27 15:57:13 -06:00
Erik Nolte
1e1e80955c Add setup.py command to run unit tests. 
Use "python setup.py test" to run unit tests.
 2011-07-22 11:47:34 -06:00
Thomas S Hatch
92d940782d update setup.py for 0.8.9 2011-07-09 17:09:15 -06:00
Thomas S Hatch
429bdb3cd2 Add runners and salt-run to the setup.py 2011-06-02 22:33:58 -06:00
Thomas S Hatch
a316924569 change the setup.py for 0.8.8 2011-05-30 15:48:56 -06:00
Thomas S Hatch
9e019dcf6c Make the setup.py proper again, allow for env var to set conf root 2011-05-23 20:00:14 -06:00
Thomas S Hatch
0f7f896520 Change the /etc path to not be absolute 2011-05-23 19:01:48 -06:00
Pedro Algarvio
5527b5ffb9 Fix #79. Don't require a privileged account to install the package. 2011-05-23 19:23:42 +01:00
Thomas S Hatch
cd83ffcaee Add json files to the example templates in the setup.py 2011-05-16 22:26:56 -06:00
Thomas S Hatch
ec98c33ac5 Add the yaml-mako template example 2011-05-14 17:17:00 -06:00
Thomas S Hatch
f201d02cc0 Add LICENCE file to the distribution, bump rel to 0.8.7 2011-05-14 14:23:22 -06:00
Thomas S Hatch
74a8fc033f Change the man page paths, add the salt-cp manpage 2011-05-13 22:35:00 -06:00
Thomas S Hatch
bec59e7407 Add renderers to the setup.py 2011-05-12 12:05:00 -06:00
Thomas S Hatch
5b516bdfe0 Beef up the setup.py foro documentation handling 2011-05-12 09:08:43 -06:00
Thomas S Hatch
901d36f327 move man pages into doc directory preperatory for more documentation 2011-05-12 08:46:30 -06:00
Thomas S Hatch
ad9489b3f0 Add classifiers to the setup.py 2011-05-06 08:28:34 -06:00
Thomas S Hatch
cfc7a579fb Add states and grains to the setup.py 2011-04-29 16:07:53 -06:00
Thomas S Hatch
184dd2ec63 Add salt-call to the setup.py 2011-04-23 14:34:46 -06:00
Thomas S Hatch
a0a26ca6de bump to 0.8.0 2011-04-16 23:58:48 -06:00
Thomas S Hatch
50d79e3b8e Add returners module to the setup.py 2011-04-16 14:48:13 -06:00
Thomas S Hatch
9e3eec914d Fix that salt-cp thing in the setup.py 2011-04-12 20:26:04 -06:00
Thomas S Hatch
e33bee620f Add salt-ftp script ot the setup 2011-04-04 22:26:44 -06:00
Thomas S Hatch
eeba3c6964 Add cython modules to setup.py 2011-04-03 16:25:17 -06:00
Thomas S Hatch
812abd6350 Set the release files to 0.7.0 2011-04-02 12:25:32 -06:00
Thomas S Hatch
1115977688 fix reference to salt.7 manpage 2011-04-01 23:54:16 -06:00
Thomas S Hatch
509278cf22 clean up spacing in the setup.py 2011-04-01 23:38:20 -06:00
Thomas S Hatch
d5d006dff6 Remove the Arch init scripts from the setup.py, init scripts should be 
installed with the distribution package
 2011-04-01 23:29:34 -06:00
Thomas S Hatch
f856311f71 Add manpages to the setup.py 2011-04-01 23:22:19 -06:00
Thomas S Hatch
396a2f843a Remove clust data from the setup.py 2011-04-01 18:30:18 -06:00
Thomas S Hatch
ee631772cd Add libexec scripts to the package 2011-03-28 22:44:29 -06:00
Thomas S Hatch
0bfdf9b744 Add the saltkey files to the setup.py 2011-03-23 23:50:34 -06:00
Thomas S Hatch
6c418677af add a .0 to 0.6, because it works better that way 2011-03-17 11:58:12 -06:00
Thomas S Hatch
e590eb1ea3 Bump the version to 0.6, it is alpha time 2011-03-17 10:37:18 -06:00
Thomas S Hatch
693195a87e add cli component to the setup.py 2011-03-09 10:52:22 -07:00
Thomas S Hatch
e4fd8db176 fix minor spacing issue in setup.py 2011-03-07 09:16:12 -07:00
Thomas S Hatch
8513d765a0 Add the salt.modules module to the package 2011-03-03 16:06:18 -07:00