Commit Graph

388 Commits

Author SHA1 Message Date
Pedro Algarvio
7b25430cc7 Download the necessary DLLs for windows 2015-08-17 19:48:00 +01:00
Pedro Algarvio
86692a92cd Install PyCrypto from a wheel in repo.saltstack.com under Windows 2015-08-17 19:48:00 +01:00
Pedro Algarvio
915da594c2 Skip M2Crypto in Windows.
Wwe're installing M2CryptoWin{32,64} which comes compiled
2015-08-17 19:48:00 +01:00
Pedro Algarvio
1ea426e299 Move code to properly handle default requirements.
Refs #26305
2015-08-17 19:48:00 +01:00
Pedro Algarvio
8fda8c0db3 M2CryptoWin{32,64} should only be installed on Salt < 2015.8.0 2015-08-17 19:48:00 +01:00
Pedro Algarvio
0ff2f19aee Override the develop command in cmdclass 2015-08-17 19:47:59 +01:00
Pedro Algarvio
a5aa752a85 Override the develop command when WITH_SETUPTOOLS is set 2015-08-17 19:47:59 +01:00
Pedro Algarvio
4d6841c761 Install M2CryptoWin{32,64} while installing Salt 2015-08-17 19:47:59 +01:00
Loren Carvalho
33ed315c85 fixed Packaing -> Packaging typo and added a couple comments on the setuptools/distutils abstract methods 2015-08-17 15:33:51 +01:00
Loren Carvalho
4afc820fd5 fixed Packaing -> Packaging typo and added a couple comments on the setuptools/distutils abstract methods 2015-08-15 21:04:51 -07:00
Jacob Hammons
d27ab32d0e copy spm.1 man page during setup
Refs #25213
2015-07-08 19:25:09 -06:00
Colton Myers
785f1575e8 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/fileclient.py
    salt/modules/glance.py
2015-07-06 12:03:11 -06:00
Colton Myers
187268d879 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
    setup.py
2015-07-02 09:42:57 -06:00
Jay Bendon
c6a501ebda quick fix for issue #18447 2015-06-30 14:59:00 -07:00
Pedro Algarvio
a138a7b83c SPM also works on windows 2015-06-29 15:51:12 +01:00
Pedro Algarvio
ac086c9311 Add the spm script to setup.py 2015-06-29 15:49:48 +01:00
rallytime
9a6b159422 Remove SALT_CLOUD_REQS from setup.py --> develop
Since requirements/cloud.txt was removed, don't reference it in setup.py
2015-06-17 10:00:17 -06:00
rallytime
48769a544d Remove SALT_CLOUD_REQS from setup.py
Since cloud-requirements.txt was removed, don't reference it in setup.py
2015-06-17 09:56:13 -06:00
Thomas S Hatch
cf1c77fc90 Merge pull request #21416 from haim0n/develop
setup.py: fix "invalid command name" error from distutils.dist for write-salt-ssh-packaging-file and write-salt-version
2015-03-17 17:55:25 -06:00
Colton Myers
fd93491a5f Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
	salt/cloud/clouds/linodepy.py
	salt/master.py
	salt/modules/boto_route53.py
	salt/modules/virt.py
	salt/renderers/gpg.py
	salt/runners/doc.py
	salt/runners/jobs.py
	salt/runners/manage.py
	salt/runners/virt.py
	salt/utils/event.py
	salt/utils/http.py
2015-03-16 15:12:02 -06:00
Colton Myers
bdfdd3f232 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	salt/modules/virt.py
2015-03-11 16:09:57 -06:00
Justin Findlay
e6f8ea3c7c Don't obfuscate internal distutils attributes
Related to #21559, fixes #21522.
2015-03-11 14:54:47 -06:00
Pedro Algarvio
e5a7158069 Don't obfuscate the internal version attribute
Fixes #21522
2015-03-11 19:21:59 +00:00
Haim Daniel
178b61033d setup.py: fix "invalid command name" error from distutils.dist for
write-salt-ssh-packaging-file and write-salt-version
2015-03-09 08:03:38 +02:00
Erik Johnson
94d55889d7 Resolve merge conflicts 2015-02-28 12:35:25 -06:00
Erik Johnson
b23a8788c1 Add imp to windows freezer_includes
Got an ImportError on this line when I was testing on Windows.

https://github.com/terminalmage/salt/blob/43e15d8/salt/loader.py#L624
2015-02-27 14:53:59 -07:00
Erik Johnson
ae5cad196c Add imp to windows freezer_includes
Got an ImportError on this line when I was testing on Windows.

https://github.com/terminalmage/salt/blob/43e15d8/salt/loader.py#L624
2015-02-26 00:23:26 -06:00
Mikhail Matyunin
91200a25e6 Remove breaking "Static" word on line 647 2015-01-28 10:18:32 +03:00
Mikhail Matyunin
71cc779309 Code block start comment typo 2015-01-27 10:12:35 +03:00
Pedro Algarvio
74e513f6f3 Fix requirements files paths 2015-01-12 19:58:09 +00:00
Pedro Algarvio
e2e535824a Use SaltStackVersion since we don't yet know when Boron will come out 2015-01-10 21:18:51 +00:00
Pedro Algarvio
3f14678796 Throw an error when the time comes to remove the deprecated code. 2015-01-10 21:18:51 +00:00
Pedro Algarvio
8a6e0a38ed Remove unnecessary code 2015-01-10 21:18:51 +00:00
Pedro Algarvio
b2c710e375 Salt path options are now global and default to None.
Since we now evaluate each `salt.syspath` entry one by one, we only set
the passed settings in the generated `_syspaths` module.

The default values will mandate unless explicitly overridden in the
setup stage.

Refs #19157, #19160, #19161
Fixes #19514
Closes #19515
2015-01-10 21:18:51 +00:00
Anton D
e8a50ffc5c Explicitly include stdlib csv module in esky build. Fixes missing csv module in Windows builds. 2014-12-10 15:54:49 -07:00
Anton D
71cc402eb7 Explicitly include stdlib csv module in esky build. Fixes missing csv module in Windows builds. 2014-12-04 22:34:37 +13:00
Colton Myers
dc43840cee Merge branch '2014.7' into merge-forward
Conflicts:
	salt/modules/glusterfs.py
	salt/modules/macports.py
	salt/modules/makeconf.py
	salt/modules/mdadm.py
	salt/modules/smartos_vmadm.py
	salt/modules/zypper.py
	salt/utils/event.py
	tests/integration/netapi/rest_tornado/test_app.py
	tests/unit/netapi/rest_tornado/test_handlers.py
2014-11-21 12:05:32 -07:00
Pedro Algarvio
253fc45a28 Add missing comma 2014-11-19 23:10:36 +00:00
Colton Myers
9a89057f83 Merge branch '2014.7' into merge-forward
Conflicts:
	salt/transport/__init__.py
2014-11-13 12:40:24 -07:00
Pedro Algarvio
f1d2fd8215 Re-enable setuptools console_scripts 2014-11-11 16:19:18 +00:00
Pedro Algarvio
56f68a1639 Don't update from attributes starting with __ 2014-11-07 21:38:25 -07:00
Thomas S Hatch
ef3112269f handle case where py3 distutils is imutable 2014-11-07 21:38:25 -07:00
Thomas S Hatch
b731ffd0ca make setup.py run on python3 2014-11-07 21:38:23 -07:00
Pedro Algarvio
1372d65a7c Copy setup.py from 2014.7.
Fixes #17138
2014-11-04 17:43:02 +00:00
Colton Myers
dd67f54abe Merge branch '2014.7' into develop
Conflicts:
	setup.py
2014-11-03 16:42:29 -07:00
Pedro Algarvio
069785e892 Install the salt.utils.openstack.pyrax package.
Refs https://github.com/saltstack/salt/issues/16519#issuecomment-60610857
2014-10-28 03:25:07 +00:00
Pedro Algarvio
096347e8f9 Greatly simplify Salt's setup.py script logic 2014-10-05 20:05:26 +01:00
Thomas S Hatch
ffed07cb8a clear out print statements 2014-10-03 14:09:16 -06:00
Thomas S Hatch
d016743c4f Add check for ssh-packaging 2014-10-03 13:55:32 -06:00
Pedro Algarvio
4df44783ed Move the SSH checks out of the windows checks 2014-10-01 22:57:39 +01:00
Pedro Algarvio
c081844c22 Add salt-call to the available scripts and allow packaging with setuptools 2014-10-01 21:39:37 +01:00
Pedro Algarvio
5afb59090d Also include salt-run in the packaged scripts 2014-10-01 21:00:10 +01:00
Pedro Algarvio
ec09c5b837 Allow packaging salt-ssh as a package.
This works by passing `--ssh-packaging` to the `sdist` command

```
python setup.py sdist --ssh-packaging
```
2014-10-01 20:49:36 +01:00
Seth House
1e6155928f Added salt-unity manpages to setup.py data_files
Refs #13937
2014-09-16 12:01:16 -07:00
Pedro Algarvio
3ca76ff2aa Fix esky builds when using setuptools 2014-08-27 22:37:07 +01:00
Nahum Shalman
cdae8948a1 SmartOS esky packaging of 2014.7
Resulting builds can be used either with zeromq or with raet
2014-08-21 16:01:46 -04:00
Pedro Algarvio
ecc9ce4f35 sdist must also generate and include salt/_version.py 2014-08-01 20:18:01 +01:00
Erik Johnson
a5dcf7c4e2 Add requests to freezer includes
This will be required to run 2014.7.x on Windows
2014-07-22 17:54:15 -05:00
Seth House
cc5fe7f368 Add netapi packages to setup.py packages list 2014-06-25 17:08:17 -06:00
Thomas S Hatch
de9451eaa1 Merge pull request #13625 from s0undt3ch/hotfix/setup-raet
ZeroMQ dependencies should be pulled by default
2014-06-22 17:31:27 -06:00
Seth House
2ee3f2b30b Merge pull request #13627 from s0undt3ch/hotfix/bootstrap-script
Update to latest bootstrap-script.sh, v2014.06.21
2014-06-21 11:53:23 -06:00
Seth House
bd794dd1e0 Merge remote-tracking branch 'upstream/pr/13624' into develop 2014-06-21 11:46:14 -06:00
Pedro Algarvio
d71128f98e Update to latest bootstrap-script.sh, v2014.06.21 2014-06-21 14:46:08 +01:00
Pedro Algarvio
a5ae66c267 ZeroMQ dependencies should be pulled by default 2014-06-21 10:12:10 +01:00
Pedro Algarvio
ce4052a3b0 Let's not forget the man pages. Refs #13554 2014-06-21 09:57:39 +01:00
Pedro Algarvio
2ed40ac6f3 Install the salt-api scripts. Refs #13554 2014-06-20 16:21:31 +01:00
Pedro Algarvio
a707a4e45a Don't complain about extras_require under distutils 2014-06-20 12:10:34 +01:00
Pedro Algarvio
c1096cf760 Update bootstrap script stable version 2014-06-19 19:36:51 +01:00
Pedro Algarvio
1a9a7fb87e Merge branch 'develop' of github.com:saltstack/salt into hotfix/saltapi-merge-tests 2014-06-19 12:01:33 +01:00
Seth House
ffd0595864 Added salt-api to setup.py 2014-06-18 22:14:16 -06:00
Pedro Algarvio
1d0fdd5a6c Allow transport to be none to skip ZeroMQ deps 2014-06-19 00:07:30 +01:00
Pedro Algarvio
5a781eb9a6 Support the best possible option for all
* pip based installations default to ZeroMQ:

  pip install salt

* pip based installations can additionally install REAT deps

  pip install salt[RAET]

On local checkout's:

* pip based installation with requirements files can choose which, or both, just use the right requirements file(s)

  pip install -r raet-requirements.txt

* pass ``--salt-transport` to choose which, `zeromq`, `raet` or `both`. Choosing `raet` removes the `zeromq` deps
2014-06-18 23:56:24 +01:00
Pedro Algarvio
da1f8bd4b7 Start off with the common salt install requires 2014-06-18 00:45:05 +01:00
Pedro Algarvio
1eb5156837 Move the --salt-transport to the install command 2014-06-18 00:34:04 +01:00
Pedro Algarvio
b5b51fc7ed Partially revert "Differentiate ZeroMQ from RAET based installations."
This partially reverts commit e4179cdc68.
2014-06-17 23:56:05 +01:00
Pedro Algarvio
e4179cdc68 Differentiate ZeroMQ from RAET based installations.
Since the requirements are different, "decide" which to require.
2014-06-17 15:36:02 +01:00
David Boucha
e0c86978c3 add sqlite to the esky builds 2014-06-12 13:55:04 -06:00
David Boucha
131aa168c6 Add sqlite3 to the freezer includes 2014-05-22 14:12:28 -06:00
Pedro Algarvio
bba9c3f4d2 Update generated salt/_version.py file to use __saltstack_version__. 2014-05-06 05:43:22 +01:00
Samuel M Smith
a68daa450f Removed references to raet and table from setup.py 2014-04-10 16:59:56 -06:00
Jason Mehring
37a1c690c7 salt.utils.serializers package missing from setup.py 2014-04-09 05:35:07 -04:00
Pedro Algarvio
33ca7f6817 Better variable names. 2014-04-08 08:30:47 +01:00
Thomas S Hatch
2df20719de Allow for more files to be more easily set to executable
This allows for files to just be listed and then BAM! They are
installed executable
2014-04-07 23:29:29 -06:00
Thomas S Hatch
737a21c34c Add lxc templates to the mix 2014-04-07 16:19:47 -06:00
David Boucha
f02dfbbd04 Include psutil on Windows 2014-03-31 11:21:08 -06:00
Gareth J. Greenaway
19f5d19f1f change in InstallLib assumes build/lib/salt and looks for a file based on that assumption. on certain platforms this fails and causes the setup.py to fail. 2014-03-18 20:27:48 -07:00
Massimiliano Torromeo
ba92bb7b81 Fix permissions of the ssh-id-wrapper script 2014-03-17 17:56:31 +01:00
Massimiliano Torromeo
8f69fa4fb9 Moved git wrapper script to the package templates directory 2014-03-14 09:21:09 +01:00
Massimiliano Torromeo
4b620f0097 Add salt-git-ssh script to pass the ssh identity to the git command. 2014-03-14 09:21:09 +01:00
Massimiliano Torromeo
e1fbcb8ce1 Fix template packaging issue 2014-03-13 11:24:30 +01:00
Thomas S Hatch
ab576bb069 Merge pull request #10920 from gtmanfred/nova
Create SaltNova class
2014-03-04 19:36:30 -08:00
Thomas S Hatch
848207e541 Add client.raet to packages 2014-03-03 22:10:43 -07:00
Daniel Wallace
742ecfa53b add to setup.py 2014-03-03 15:04:52 -06:00
Mathieu Le Marec - Pasquet
6483539dc3 fix setup.py typo 2014-03-02 15:58:19 +00:00
Thomas S Hatch
6a3152255a Don't fail the setup.py if zmq is a liile on the old side 2014-02-26 15:35:25 -07:00
Thomas S Hatch
6969758108 Add salt-unity to the base deployment 2014-02-26 15:17:14 -07:00
Pedro Algarvio
13cfa54065 Properly handle PyZMQ >= 0.14 when freezing 2014-02-26 06:24:55 +00:00
Thomas S Hatch
b15387920d Add the floscripts to the setup.py 2014-02-25 14:35:34 -07:00
Thomas S Hatch
613926b27e update the setup.py for daemons/flo dir rename 2014-02-25 10:41:25 -07:00
Christopher A. Stelma
f5bdf7a24b full module list and alphabetize 2014-02-05 16:50:41 -08:00
Christopher A. Stelma
a0245efb85 package salt.daemons 2014-02-05 16:37:31 -08:00
Nahum Shalman
7b9712c2d2 SmartOS Esky build: Just try to grab everything
After discovering missing modules one at a time I went in search
of a bigger hammer.

We use the bbfreeze ModuleGraph code to find all deps for
salt.modules.* and add them to the FREEZER_INCLUDES variable.

It may be worth trying this approach for other platforms...
2014-01-30 14:06:19 -05:00
Alexey Ivanov
62464b237f setup: fixed shebang 2014-01-13 00:58:57 -08:00
David Boucha
a7807a92d9 Add more Windows libraries to freezer 2014-01-10 12:27:40 -07:00
David Boucha
6eae8acfa4 add win32net to windows freezer includes 2014-01-10 10:12:04 -07:00
Pedro Algarvio
ad54eca1ab Only update the bootstrap script on request. Fixes #9535. 2014-01-03 01:24:17 +00:00
Thomas S Hatch
ae9d127a99 Add salt.transport to installed packages 2013-12-23 10:27:53 -07:00
Thomas S Hatch
7407f8b75b Merge pull request #9043 from garethgreenaway/develop
Adding support to manage networks on Debian/Ubuntu systems.
2013-12-06 08:21:31 -08:00
Pedro Algarvio
9226f98bfe Let's include Salt Cloud to avoid circular import issues in Windows. 2013-12-05 20:46:35 +00:00
Gareth J. Greenaway
e30bd1673e Adding support to manage networks on Debian/Ubuntu systems. 2013-12-04 20:38:25 -08:00
Pedro Algarvio
9767d83e67 salt.cloud.utils is no longer a package. 2013-11-21 20:33:12 +00:00
Pedro Algarvio
582207634a apache-libcloud should not be a dependency for Windows. 2013-11-18 17:39:27 +00:00
Pedro Algarvio
60dabead8f Invert debugging logic. 2013-11-15 17:23:58 +00:00
Pedro Algarvio
5c1fc92715 Strip ALL non windows scripts from sdist. 2013-11-15 17:22:29 +00:00
Pedro Algarvio
99148a1380 Better exec() detection. Avoids esky build NameError. 2013-11-14 23:01:30 +00:00
Pedro Algarvio
12880907d8 Make PyLint a bit happier. 2013-11-14 18:49:26 +00:00
Pedro Algarvio
8c14e211b7 Fix some missing variables and imports. 2013-11-14 18:18:51 +00:00
Pedro Algarvio
2c53c11793 Add support to download the latest stable bootstrap script.
If we're not installing under Windows, provide the same features salt-cloud had at install time before the merge.
2013-11-14 18:06:12 +00:00
Pedro Algarvio
9e5ba8c45f Another missing comma. 2013-11-14 08:22:42 +00:00
Pedro Algarvio
5e76d602ea Add some missing commas. 2013-11-14 07:59:55 +00:00
Pedro Algarvio
62263be9c8 Man7 should be included. 2013-11-14 07:54:31 +00:00
Pedro Algarvio
344cb8f120 There are still some more script which should not be available on windows. 2013-11-14 07:52:28 +00:00
Pedro Algarvio
20434a19a5 Append on the right key. 2013-11-14 07:25:46 +00:00
Pedro Algarvio
56ac7137fd Salt cloud should not be packaged to windows. 2013-11-14 07:20:01 +00:00
dongweiming
be18f72a69 Modify: clean use glob to match filename that need remove 2013-11-12 13:10:41 +08:00
Pedro Algarvio
76d1629ba4 doc/man/salt-cloud.7 is no longer generated. 2013-11-10 13:47:14 +00:00
Thomas S Hatch
e0b1a02ef1 Initial add of salt-cloud to setup.py 2013-11-08 14:47:41 -07:00
Nahum Shalman
5079d271fb Add 'email' and 'email.mime.*' to all esky builds
Fixes "ImportError: No module named audio" on SmartOS

Uses 'email.mime.*' rather than a full list of entries.

Also removes a duplicate entry for 'fileinput' from the
windows section that was added to the main FREEZER_INCLUDES

Email thread that suggested this fix:
https://groups.google.com/forum/#!msg/salt-users/_9ynHspSgjk/so0hRdbaPM0J

Tested as a fix to a 0.17.1 checkout on SmartOS.
2013-10-29 14:24:45 -04:00
David Boucha
4f247a635a These modules are needed for frozen Windows builds 2013-10-28 12:18:36 -06:00
Thomas S Hatch
387f097959 Merge pull request #7807 from scottp-dpaw/develop
Bootstrapping for Windows minions
2013-10-15 09:49:08 -07:00
Valentin Bud
5ae5b70794 Added salt.utils.validate to setup.py. 2013-10-15 14:28:58 +03:00
Scott Percival
6e8dd2a02c Added more modules missed by bdist_esky 2013-10-10 17:01:17 +08:00
David Boucha
d5a7b2195c Add fileinput to list of Windows modules to freeze 2013-10-08 08:03:08 -06:00
Ajith Antony
b95a5d9fd0 Virt Template deploy, and serial xml tests
- Added virt templates to setup
- moved NIC xml string template to file
- added tests for serial xml
2013-10-03 13:21:34 -05:00
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