394 Commits

Author	SHA1	Message	Date
markuskramerIgitt	5e3bcc2e3f	remove windows build cache	2018-07-19 18:25:21 +02:00
rallytime	6f6c99b4ce	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/modules/cron.py - salt/netapi/rest_tornado/saltnado.py	2018-07-11 15:06:35 -04:00
rallytime	68aabff0cf	Merge branch '2017.7' into '2018.3' ... Conflicts: - pkg/windows/req.txt - salt/netapi/rest_tornado/saltnado.py - salt/utils/versions.py - tests/integration/states/test_file.py	2018-07-09 10:27:58 -04:00
Daniel Wallace	22cd4206c4	Merge pull request #48472 from gtmanfred/2017.7 ... use tox to run pylint	2018-07-06 21:46:46 -05:00
twangboy	935f9b560c	Fix dependencies ... Adds back libnacl Adds back libsodium.dll Adds new python-certifi-win32	2018-07-06 15:46:57 -06:00
Daniel Wallace	44aaac1d33	use tox to run pylint ... Also allow pylint to be run from a virtualenv	2018-07-06 13:25:08 -05:00
Jorge Schrauwen	0d31b1388b	Fix dependancy for esky build on SmartOS	2018-06-30 01:11:23 +02:00
rallytime	d991430715	Merge branch '2018.3' into 'develop' ... No conflicts.	2018-06-07 13:03:54 -04:00
rallytime	a6533a9332	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-06-06 11:55:29 -04:00
rallytime	be8d34ec21	Merge branch '2018.3' into 'develop' ... No conflicts.	2018-06-01 15:19:09 -04:00
twangboy	4538b3abb3	Remove 'len-as-condition' disablement	2018-06-01 11:51:52 -06:00
twangboy	d4efcc3c8b	Skip lint errors	2018-06-01 11:51:08 -06:00
twangboy	1b3977f8d4	Remove m2crypto download for Windows ... Fix pip issue with pip 10	2018-06-01 11:50:59 -06:00
twangboy	72cc361c7b	Move pytz to 3rd party import, add to __virtual__ ... Add pytz to freezer includes	2018-05-25 11:46:45 -06:00
Thayne Harbaugh	a66802c75a	Various clean-ups, fixes and improvements to SPM directory references ... in the base paths used in syspaths.py.	2018-05-04 17:41:57 -06:00
twangboy	eb3d45bb08	Remove installation of pywin32 from setup.py ... This keeps regressing for some reason. This is the 3rd time I've had to fix this... I believe	2018-04-20 15:05:51 -06:00
rallytime	fe2d46dd0c	Better merge conflict resolution for setup.py windows changes	2018-03-16 12:38:29 -04:00
rallytime	8d1e1e7f94	Merge branch '2017.7' into '2018.3' ... Conflicts: - .kitchen.yml - Gemfile - pkg/windows/build_env_2.ps1 - pkg/windows/build_env_3.ps1 - pkg/windows/req.txt - salt/client/ssh/__init__.py - salt/client/ssh/ssh_py_shim.py - salt/modules/boto_vpc.py - salt/modules/file.py - salt/modules/heat.py - salt/modules/smartos_vmadm.py - salt/modules/win_dsc.py - salt/returners/elasticsearch_return.py - salt/runners/salt.py - salt/states/module.py - salt/utils/win_functions.py - setup.py - tests/integration/modules/test_state.py - tests/unit/grains/test_core.py - tests/unit/test_pillar.py	2018-03-15 17:22:05 -04:00
twangboy	bcf8b19566	Update the installer build ... Fixes some issues with Py3 not building Brings the 2 build_env files more in line with each other Fixes some typos in the build_env scripts Removes the need for seperate req files for Py2 and Py3 Setup.py uses the windows req file on Windows Removes the need to install pycrypto and pyyaml in setup.py. They are now handled in the req.txt Uses pypi resources instead of downloading .whl files and .exes for dependencies Updates nssm version to address the issue in #46192 Removes nssm from buildenv and downloads 32 and 64 bit versions of nssm in build_pkg.bat Removes the AppNoConsole=1 setting from the nsis script since it is not needed with the new version of nssm	2018-03-02 13:04:48 -07:00
Erik Johnson	160dcc4ca0	Appease pylint	2018-02-14 14:52:22 -06:00
Erik Johnson	61b90bc4bf	setup.py: Work around bad code in distutils ... While running an sdist, distutils logs when it creates paths. However, if the paths are unicode _and_ contain unicode code points, the log message results in a `UnicodeEncodeError` as distutils attempts to perform string replacement using a str format string and a unicode path. Paths recently added in the test suite's files to test unicode compatibility have caused this issue to surface. This fixes the resulting traceback by ensuring that Python 2 only passes utf-8 encoded bytestrings when making the release tree.	2018-02-14 11:43:06 -06:00
Daniel Wallace	8ebf937b21	decode file list for setup.py on python2	2018-02-01 11:51:59 -07:00
twangboy	c933f46c6a	Add check for pypiwin32 also	2018-01-03 14:33:06 -07:00
twangboy	15317951fc	Update setup.py for new windows install ... setup.py - Remove PyCrypto install, that happens through req.txt - Remove PyYAML install, that happens through req.txt - Add PyWin32 install, that happens with downloaded .whl - Detect if PyWin32 is already installed before installing build_env_#.py - Put PyWin32 dlls in Python root instead of site-packages\win32 - hide gen_py directory creation message	2018-01-03 14:28:36 -07:00
twangboy	1ba89026b2	Consolidate req file	2017-12-06 08:35:31 -07:00
rallytime	c0f16dae74	Merge branch '2017.7' into 'develop' ... Conflicts: - doc/topics/tutorials/index.rst - salt/crypt.py - salt/modules/cmdmod.py - salt/modules/grains.py - salt/pillar/git_pillar.py - salt/roster/clustershell.py - tests/unit/states/test_augeas.py - tests/unit/utils/test_utils.py	2017-10-16 15:26:19 -04:00
rallytime	1d4a6c3949	Lint: Fixup undefined variable errors	2017-10-11 09:25:41 -04:00
rallytime	788ad0609a	Merge branch '2016.11' into '2017.7' ... No conflicts.	2017-10-10 16:34:52 -04:00
Pablo Suárez Hernández	44bc91bb98	Enable '--with-salt-version' parameter for setup.py script	2017-10-06 17:12:15 +01:00
Gareth J. Greenaway	2cdd775ca8	Adding back in the salt-spm-reactor-dir	2017-09-15 08:40:38 -07:00
Gareth J. Greenaway	fadcc61618	Adding home_dir to SaltDistribution.global_options.	2017-09-14 18:34:32 -07:00
Gareth J. Greenaway	c70df4adcd	Following the change in #42103 if Salt is installed via setup.py then the generated _syspaths.py does not contain the HOME_DIR which results in a failure.	2017-09-14 16:18:45 -07:00
Michael Calmer	0c6611f274	do not generate a date in a comment to prevent rebuilds (bsc#969407)	2017-06-16 14:37:45 +02:00
rallytime	9ff2694155	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - pkg/salt-minion.service - salt/modules/junos.py - salt/modules/localemod.py - salt/modules/win_system.py - salt/states/junos.py - tests/unit/modules/test_localemod.py - tests/unit/modules/test_win_powercfg.py - tests/unit/states/dockerng_test.py	2017-05-24 16:32:59 -06:00
Benjamin Drung	33a7f8b2ec	Fix typos ... lintian found several spelling errors. Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>	2017-05-24 12:50:29 +02:00
twangboy	c03f8d39d2	Use req_2.txt for Py2	2017-04-27 09:51:32 -06:00
twangboy	57d5f781f4	Use req files in pkg\windows for setup	2017-04-27 09:47:46 -06:00
Pedro Algarvio	281e0cafb2	Fix resource leakage	2017-04-05 23:18:00 +01:00
twangboy	984ee934a7	Merge branch 'develop' of https://github.com/saltstack/salt into develop	2017-03-10 21:53:07 +00:00
twangboy	02757db1e4	Add python 3 installer for Windows	2017-03-10 21:52:38 +00:00
Pedro Algarvio	0de35b51cc	Lint and syntax fixes	2017-03-09 19:29:15 +00:00
Joseph Hall	829f7008f1	Fill in a couple more spots	2017-03-02 05:27:20 -07:00
Joseph Hall	7ebf1cf104	Fix paths from SPM files PR	2017-03-02 05:17:42 -07:00
rallytime	609e6e4b23	Merge branch '2016.11' into 'develop' ... Conflicts: - salt/config/__init__.py - salt/modules/win_lgpo.py - salt/utils/aws.py - tests/unit/utils/schema_test.py	2017-02-09 10:29:40 -07:00
Morgan Willcock	d7e05091a2	Remove global options from Install	2017-02-04 19:00:36 +00:00
markuskramerIgitt	5375bf5cb4	Option to compile the Salt-Minion installer offline	2017-01-27 22:55:41 +01:00
markuskramerIgitt	b4aa2ffaab	Option to compile the Salt-Minion installer offline	2017-01-27 22:52:21 +01:00
Mike Place	4956d7d5a3	Merge branch '2016.3' into 2016_3_develop	2016-09-26 21:47:32 +09:00
rallytime	d5bbd91c14	Merge branch '2016.3' into 'carbon' ... Conflicts: - conf/master	2016-09-23 17:01:17 -06:00
rallytime	52cf40db8c	Merge branch '2015.8' into '2016.3' ... No conflicts.	2016-09-23 08:32:47 -06:00