Commit Graph

113 Commits

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