106117 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Wayne Werner	c1baa329c6	Add black and isort to precommit ... E203 is *not* pep8 compliant, pylint.	2020-04-03 08:10:58 -05:00
Daniel Wozniak	cdca5aafe0	Merge pull request #56492 from s0undt3ch/hotfix/drop-py2-builds ... Remove Py2 Pipelines	2020-04-01 10:57:10 -07:00
Pedro Algarvio	42c63f2284	Remove Py2 Pipelines	2020-04-01 16:12:00 +01:00
Daniel Wozniak	5c450f3bce	Merge pull request #56464 from frogunder/releasenotes3000.1 ... 3000.1 releasenotes	2020-03-27 13:16:09 -07:00
Frode Gundersen	6d2281a0ca	3000.1 releasenotes	2020-03-27 16:55:18 +00:00
Daniel Wozniak	c5a700e01e	Merge pull request #56455 from s0undt3ch/hotfix/gitpython ... Fix gitpython windows requirement	2020-03-27 09:31:56 -07:00
Pedro Algarvio	d9791c393f	Revert and fix windows requirements	2020-03-26 17:20:21 +00:00
Pedro Algarvio	4b573c1c94	Revert "Fix win deps" ... This reverts commit 6c83beeb9e.	2020-03-26 17:20:11 +00:00
Daniel Wozniak	7ba36325d9	Merge pull request #56446 from frogunder/releasenotes_3000.1_updates ... 3000.1 releasenotes updates	2020-03-24 13:28:21 -07:00
Frode Gundersen	6b47f474af	3000.1 releasenotes updates	2020-03-24 19:58:54 +00:00
Daniel Wozniak	4d2bc7004d	Merge pull request #56435 from twangboy/update_mac_build_scripts ... Update mac build scripts	2020-03-24 12:47:39 -07:00
Daniel Wozniak	8a8ae8ebe4	Merge pull request #56436 from Ch3LL/pip_custom_pypi ... Fix #56433 - test_pip_installed_specific_env	2020-03-24 12:47:19 -07:00
Daniel Wozniak	55655ff96c	Merge branch 'master' into pip_custom_pypi	2020-03-24 09:42:57 -07:00
Daniel Wozniak	5d244b0aa6	Merge branch 'master' into update_mac_build_scripts	2020-03-24 09:42:35 -07:00
Daniel Wozniak	3a993d73a9	Merge pull request #56423 from Ch3LL/changelog_again ... Update changelog with package fixes	2020-03-24 09:42:16 -07:00
twangboy	8fdf52a243	Update gitpython to 2.1.15	2020-03-24 01:38:53 +00:00
twangboy	afcedc5232	Remove --ignore-installed	2020-03-23 17:36:24 -06:00
Pedro Algarvio	e6cc2a6192	Separate pyobjc requirements	2020-03-23 22:52:24 +00:00
Pedro Algarvio	262ad2e98a	Compile static requirements	2020-03-23 22:36:07 +00:00
ch3ll	86fe450c82	Fix #56433 - test_pip_installed_specific_env	2020-03-23 17:18:14 -04:00
ch3ll	963c16e1a7	update pr number for mac build changes in changelog	2020-03-23 16:36:58 -04:00
ch3ll	83e22b77c7	Update changelog with package fixes	2020-03-23 16:35:28 -04:00
twangboy	224f72d0f2	Update noxfile and .precommit	2020-03-23 13:58:38 -06:00
twangboy	68a36f2e37	Add req_ext.txt	2020-03-23 13:58:38 -06: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
Daniel Wozniak	74575a6993	Merge pull request #56418 from Ch3LL/egg_version ... Ensure version.py included before we install	2020-03-23 11:27:44 -07:00
twangboy	3bda8ddb82	Update noxfile and pre-commit	2020-03-20 17:52:59 -06:00
twangboy	de58c52d66	Merge branch 'update_mac_build_scripts' of https://github.com/twangboy/salt into update_mac_build_scripts	2020-03-20 16:45:25 -06:00
twangboy	02dfe4119c	Add pyobjc in its own requirements file	2020-03-20 16:44:20 -06:00
Pedro Algarvio	e7f08d5349	Update static requirements	2020-03-20 20:14:35 +00:00
Pedro Algarvio	a53977de5b	Merge branch 'update_mac_build_scripts' of github.com:twangboy/salt into update_mac_build_scripts	2020-03-20 20:13:31 +00:00
twangboy	6b2ac2be64	Remove pyobjc, enforce pip install location	2020-03-20 14:07:15 -06:00
ch3ll	85d7c784ef	Fix integration setup egg test	2020-03-20 11:27:40 -04:00
ch3ll	a8a22a4040	Ensure version.py included before we install	2020-03-19 17:23:42 -04:00
Pedro Algarvio	04e5cde9dd	pkg/osx/req_ext.txt no longer exists	2020-03-19 21:16:48 +00:00
Pedro Algarvio	be4a272d07	Update static requirements	2020-03-19 21:15:41 +00:00
Salt Admin	30ca5d04ec	Remove cryptography, it gets installed by pyopenssl	2020-03-19 14:53:18 -06:00
Pedro Algarvio	fda8abf4a8	Update static requirements	2020-03-19 18:59:11 +00:00
Salt Admin	732ecc83c1	Update pre-commit config	2020-03-19 12:52:52 -06:00
Salt Admin	1fa9864e3d	Don't set a version for pyopenssl	2020-03-19 12:08:16 -06:00
Salt Admin	461b198978	Update dependencies, remove req_ext.txt	2020-03-19 11:59:11 -06:00
Daniel Wozniak	249367b462	Merge pull request #56403 from frogunder/update_releasenotes_3000.1 ... update 3000.1 releasenotes	2020-03-17 16:50:19 -07:00
Frode Gundersen	9d972c96e8	update 3000.1 releasenotes	2020-03-17 22:50:29 +00:00
Daniel Wozniak	0de5c1e136	Merge pull request #56398 from Ch3LL/change_3000.1 ... Add additional PRs to 3000.1 changelog	2020-03-17 11:08:14 -07:00
ch3ll	79c337b3db	Add additional PRs to 3000.1 changelog	2020-03-17 13:08:09 -04:00
Daniel Wozniak	5ac09decb9	Merge pull request #56376 from twangboy/fix_win_deps ... Fix win deps	2020-03-17 10:02:44 -07:00
Daniel Wozniak	e72a8d2cbc	Merge pull request #56378 from Ch3LL/wheel_version ... Include _version.py if building wheel	2020-03-17 10:01:32 -07:00
Daniel Wozniak	6a9326fb70	Merge pull request #56387 from bryceml/update_gpg_key ... update gpg key expiration date	2020-03-17 09:59:29 -07:00
ch3ll	22cccd2107	Use virtualenv test helper that already exists and fix setup.py	2020-03-16 15:33:43 -04:00