valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
62,761 Commits 24 Branches 182 Tags 341 MiB
2bdd8ea28c
Commit Graph

313 Commits

Author SHA1 Message Date
Pedro Algarvio
cc3219fcde Don't install futures under Python 3 and above 2015-10-18 09:44:54 +01:00
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