Commit Graph

154 Commits

Author SHA1 Message Date
Thomas S Hatch
3f0b151bda Merge pull request #6968 from s0undt3ch/features/6962-extra-state-kwargs-error
State calls now fail if non-supported arguments are used. Fixes #6962.
2013-09-27 08:01:13 -07:00
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