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
83,135 Commits 24 Branches 182 Tags 341 MiB
d010b74b87
Commit Graph

362 Commits

Author SHA1 Message Date
Dennis Harper
cc391b6862 fix for: https://github.com/saltstack/salt/issues/27373 
Setup::DownloadWindowsDlls is downloading and writing the file as
a text not a binary file.

When creating the file handle to write the binary after being download from salt's
dependency repo, the file handle was being created with just the 'write' attribute,
however it also needs the 'binary' attribute.

Change-Id: I2f67d27ee847cd7808a78cd5ec0b2151d6a0c0e7
 2015-09-28 15:45:30 -05:00
Pedro Algarvio
10a9189d83 Merge remote-tracking branch 'upstream/2015.8' into hotfix/merge-forward-develop 2015-09-06 12:42:58 +01:00
C. R. Oldham
acc73fc546 Add salt-proxy to setup.py so it gets installed. 2015-09-04 12:05:14 -06:00
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
 2015-09-03 14:24:45 -06:00
Jacob Hammons
701f47a658 Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py 
Added salt-proxy release notes topic
Added note to pip state for Refs #21845
Regenerated and versioned man pages
 2015-09-01 17:09:35 -06:00
Pedro Algarvio
58df84e0d1 Revert "setup.py: remove raw string formatting" 
This reverts commit b6c732219c.

We actually need the `repr()` version of the object.

Fixes #26774
 2015-08-31 12:13:37 +01:00
Pedro Algarvio
2188867b3d Revert "We need the repr() for the version tuple." 
This reverts commit 03af591129.
 2015-08-31 12:10:53 +01:00
Colton Myers
1bbe45538e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/__init__.py
    salt/modules/smartos_vmadm.py
    salt/utils/s3.py
    setup.py
 2015-08-28 16:44:08 -06:00
Pedro Algarvio
03af591129 We need the repr() for the version tuple. 2015-08-28 17:42:08 +01:00
Pedro Algarvio
3f30d2a135 Use the correct names 2015-08-28 01:25:48 +01:00
Pedro Algarvio
f041653746 Handle SPM paths in the setup script 2015-08-28 01:22:14 +01:00
Erik Johnson
b6c732219c setup.py: remove raw string formatting 2015-08-26 23:26:07 -05:00
Pedro Algarvio
60c5d16330 One more missed typo 2015-08-19 19:43:37 +01:00
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
 2015-08-19 11:29:45 -06:00
Colton Myers
e57f767244 Merge pull request #26439 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-19 10:39:04 -06:00
Pedro Algarvio
dc58dbe5bf The CLI options are not meant to include underscores. 
Fixes #26444
 2015-08-18 23:18:09 +01:00
Colton Myers
8ec612e9db Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    setup.py
 2015-08-18 12:15:03 -06:00
Pedro Algarvio
06dcaefcaa Fix missed typo 2015-08-18 17:18:59 +01:00
Colton Myers
d3d0e004d9 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/keystone.py
    salt/modules/pw_user.py
    salt/states/reg.py
    setup.py
 2015-08-17 16:54:16 -06:00
Pedro Algarvio
92af1c9572 Fix argument name 2015-08-17 19:48:48 +01:00
Pedro Algarvio
72d2fdb512 Add pypiwin32 >= 219 as a windows install requires. 
Refs #26305
 2015-08-17 19:48:48 +01:00
Pedro Algarvio
b1105fc706 Allow mimicking the install setup command for develop/editable installations. 
To generate Salt's _syspaths.py file, pass `--generate-salt-syspaths` to
the develop command or set the `GENERATE_SALT_SYSPATHS` environment
variable.

Passing `--mimic-salt-install` to the develop command or setting the
`MIMIC_SALT_INSTALL` environment variable will generate `_version.py` and `_syspaths.py`

Fixes #11046
Fixes #25094
 2015-08-17 19:48:46 +01:00
Pedro Algarvio
26246a72ee Allow writing Salt's _version.py when installing in develop mode. 
Pass `--write-salt-version` or set the `WRITE_SALT_VERSION` environment
variable to trigger the generation of `_version.py`.

Closes #25094
 2015-08-17 19:48:00 +01:00
Pedro Algarvio
71928f2194 Prefer HTTPS, fix url argument 2015-08-17 19:48:00 +01:00
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