saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
107927 commits 34 branches 292 tags 803 MiB
Commit graph

421 commits

Author SHA1 Message Date
Blacken Salt
0b2a5613b3
Blacken salt 2020-04-03 13:05:41 -05:00
Pedro Algarvio
e6cc2a6192
Separate pyobjc requirements 2020-03-23 22:52:24 +00:00
twangboy
5851a5c2cd
Roll back changes, fix dependencies 2020-03-23 13:58:38 -06:00
Daniel Wozniak
d2a5bd8add
Merge pull request #56417 from twangboy/update_mac_build_scripts 
Update mac build scripts
 2020-03-23 11:45:33 -07:00
twangboy
02dfe4119c
Add pyobjc in its own requirements file 2020-03-20 16:44:20 -06:00
ch3ll
a8a22a4040
Ensure version.py included before we install 2020-03-19 17:23:42 -04:00
Salt Admin
461b198978 Update dependencies, remove req_ext.txt 2020-03-19 11:59:11 -06:00
ch3ll
22cccd2107
Use virtualenv test helper that already exists and fix setup.py 2020-03-16 15:33:43 -04:00
ch3ll
0cbf6d3246
Ensure SaltStackVersion attributes in _version.py correct 2020-03-16 13:52:48 -04:00
ch3ll
39cdf5382d
Include _version.py if building wheel 2020-03-16 13:52:44 -04:00
Daniel Wozniak
2f783d247e
Merge pull request #56099 from s0undt3ch/hotfix/requirements 
Fix Windows and macOS requirements handling in setup.py
 2020-03-10 17:04:36 -07:00
Pedro Algarvio
1e7bc8fc8f
Also take into account macOS requirements 2020-03-10 16:25:31 +00:00
Pedro Algarvio
7eef14952c
Also include req_win.txt 2020-03-10 16:15:46 +00:00
Ryan Addessi (raddessi)
82773a9799 Removed now-unused StrictVersion import from setup.py 2020-02-26 11:32:34 -07:00
Ryan Addessi (raddessi)
31bb0f7cd1 Changed StrictVersion checking of setuptools to LooseVersion 2020-02-20 22:02:20 -07:00
Pedro Algarvio
ac90bb4d9f
Allow pycrypto to be included in parsed requirements 2020-01-31 21:11:38 +00:00
Pedro Algarvio
f55dbb06b3
Include requirements/crypto.txt if transport is zeromq 2020-01-30 13:23:16 +00:00
Pedro Algarvio
ada6f6d96d
Switch to setuptools alone. Work around pypa/setuptools#456. 2020-01-27 23:01:17 +00:00
rallytime
4a218142a5
Remove support for RAET 
Conflicts:
* doc/topics/releases/neon.rst
* requirements/tests.txt
* salt/cli/caller.py
* salt/daemons/test/__init__.py
* salt/daemons/test/test_minion.py
* salt/daemons/test/test_saltkeep.py
* salt/modules/event.py
* salt/modules/raet_publish.py
* salt/transport/__init__.py
* salt/utils/parsers.py
* setup.py
* tests/unit/modules/test_raet_publish.py
 2019-10-10 09:46:39 +01:00
twangboy
43dd7b325e
Merge Forward #52593 2019-07-02 18:28:03 -06:00
Pedro Algarvio
9fef3859cf
Strings and integers are not comparable under Python 3 2019-05-08 13:16:34 +01:00
Ch3LL
77101ed4fc
Handle encoding when opening file for both py2/py3 2019-01-09 12:21:36 -05:00
Wayne Werner
ee77f7cef9
Set encoding when reading the README.rst 
Apparently there are some unicode sequences in the setup.py that cause
issues for some people.
 2019-01-09 11:23:46 -05:00
Gareth J. Greenaway
2ea7404d73
Merge branch '2018.3' into merge-fluorine 
Conflicts:
	salt/modules/aptpkg.py
 2019-01-07 10:04:56 -08:00
Wayne Werner
cd310c2501
Set long_description 
It's good to have information on PyPI if people are looking there.

---

Closes saltstack/salt#50964

Signed-off-by: Wayne Werner <wwerner@saltstack.com>
 2019-01-02 18:40:59 -08:00
Ch3LL
49368667e5
Merge branch 2018.3 into fluorine 
Conflicts:
  - salt/returners/__init__.py
 2018-11-29 13:27:26 -05:00
Daniel A. Wozniak
9c6f65363e
Handle pipenv like version restrictions 
We need to handle python_version filters in requirement files in order
to install cleanly using pip
 2018-11-26 11:33:33 -07:00
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