Commit Graph

23 Commits

Author SHA1 Message Date
rallytime
91534ee04a
Merge branch '2017.7' into '2018.3'
No conflicts.
2018-10-08 16:16:45 -04:00
twangboy
a66765fc4c
Remove arrInstalled artifact 2018-10-04 09:49:12 -06:00
twangboy
59ae2cc5fc
Use --disable-pip-version-check for build_env_#.ps1 2018-06-18 13:15:03 -06:00
twangboy
5c00fce6bf
Use the --disable-pip-version-check option 2018-06-18 19:06:10 +00:00
rallytime
4718d31e53
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/pip.py
  - salt/states/pip_state.py
  - salt/states/virtualenv_mod.py
  - tests/integration/modules/test_status.py
2018-04-19 17:15:20 -04:00
twangboy
990a24d7ed
Fix build_env scripts
Uses `cmd /c` when launching commands to avoid the hang when installing
python 3
`clean_env.bat` will uninstall Py2 and Py3 in a single run
2018-04-12 11:26:40 -06: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
twangboy
187a420327
Copy not move dlls for PY2 2018-01-04 17:15:00 -07:00
twangboy
8c732b5294
Put dlls in both places for Py2 and Py3 2018-01-04 16:40:43 -07:00
twangboy
2d636266e8
Put dlls in right place for py2 and py3
Py2 dlls go in site-packages\win32
Py3 dlls go in site-packages\win32 and the root of python
2018-01-04 15:59:04 -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
8934d7fc41
Remove postinstall script, just do it in powershell 2017-12-06 15:47:37 -07:00
twangboy
d199ef5da0
Fix postinstall for pywin32 2017-12-06 09:10:02 -07:00
twangboy
4bd0106c35
Fix pywin32 install 2017-12-06 08:50:11 -07:00
twangboy
1ba89026b2
Consolidate req file 2017-12-06 08:35:31 -07:00
twangboy
a5d9f85db6 Modifications to build scripts
Py3 installs to c:\python35
Quote the path to the python install directory
Fix spellings in comments
Move pywin32 dlls to site-packages/win32 instead of python root
Remove pywin32 postinstall and testing scripts
Add passive switch to py3 uninstall
2017-08-31 11:41:13 -06:00
twangboy
e8a24db927 Remove win_unicode_console dependency 2017-06-12 11:56:18 -06:00
Mike Place
c195d075cd Merge pull request #41151 from twangboy/fix_py_install
Fix python 2.7.13 install, fix clean script
2017-05-12 12:31:29 -05:00
twangboy
53458b88e9 Fix python 2.7.13 install, fix clean script 2017-05-09 18:32:03 +00:00
twangboy
fe20a576b5 Add win_unicode_console dep 2017-04-24 17:24:00 -06:00
twangboy
5f75ca71dd Update dates in the env scripts 2017-03-11 22:21:40 -07:00
twangboy
02757db1e4 Add python 3 installer for Windows 2017-03-10 21:52:38 +00:00