valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,753 Commits 24 Branches 182 Tags 341 MiB
a85d1d4da1
Commit Graph

127 Commits

Author SHA1 Message Date
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