Diff salt-3005.3 with a salt-3006.2

/usr/portage/app-admin/salt/salt-3006.2.ebuild 2023-10-09 14:52:28.168368317 +0300
17 17
	EGIT_BRANCH="develop"
18 18
else
19 19
	inherit pypi
20
	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
20
	KEYWORDS="~amd64 ~riscv ~x86"
21 21
fi
22 22

  
23 23
LICENSE="Apache-2.0"
......
30 30

  
31 31
RDEPEND="
32 32
	sys-apps/pciutils
33
	>=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}]
33 34
	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
34 35
	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
35 36
	dev-python/jmespath[${PYTHON_USEDEP}]
36 37
	dev-python/libnacl[${PYTHON_USEDEP}]
38
	dev-python/looseversion[${PYTHON_USEDEP}]
37 39
	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
40
	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
38 41
	>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
39 42
	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
40 43
	>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
......
83 86
	zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
84 87
"
85 88
BDEPEND="
89
	dev-python/build[${PYTHON_USEDEP}]
86 90
	test? (
87 91
		${RDEPEND}
88 92
		dev-python/apache-libcloud[${PYTHON_USEDEP}]
......
94 98
		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
95 99
		>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
96 100
		dev-python/passlib[${PYTHON_USEDEP}]
101
		dev-python/bcrypt[${PYTHON_USEDEP}]
97 102
		dev-python/pip[${PYTHON_USEDEP}]
98 103
		>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
99 104
		>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
100
		>=dev-python/pytest-salt-factories-1.0.0_rc17[${PYTHON_USEDEP}]
105
		>=dev-python/pytest-salt-factories-1.0.0_rc25[${PYTHON_USEDEP}]
101 106
		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
102 107
		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
103 108
		dev-python/pytest-subtests[${PYTHON_USEDEP}]
104 109
		dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
105 110
		dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
106 111
		dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
112
		dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
107 113
		dev-python/flaky[${PYTHON_USEDEP}]
108 114
		net-dns/bind-tools
109 115
		>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
110 116
		dev-util/yamllint[${PYTHON_USEDEP}]
111
		!x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] )
117
		!x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
112 118
	)
113 119
"
114 120

  
......
119 125
RESTRICT="!test? ( test ) x86? ( test )"
120 126

  
121 127
PATCHES=(
122
	"${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
123 128
	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
124
	"${FILESDIR}/salt-3002-tests.patch"
125
	"${FILESDIR}/salt-3003.1-tests.patch"
126
	"${FILESDIR}/salt-3005-tests.patch"
127 129
	"${FILESDIR}/salt-3005.1-no-entry-points.patch"
128
	"${FILESDIR}/salt-3005.1-importlib-metadata-5-r1.patch"
129
	"${FILESDIR}/salt-3005.1-tests.patch"
130
	"${FILESDIR}/salt-3005.1-modules-file-python-3.11-host.patch"
130
	"${FILESDIR}/salt-3006-skip-tests-that-oom-machine.patch"
131
	"${FILESDIR}/salt-3006-tests.patch"
131 132
	"${FILESDIR}/salt-3006.2-tests.patch"
132 133
)
133 134

  
......
137 138
	rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
138 139
	rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
139 140
	rm tests/unit/states/test_boto_vpc.py || die
140
	rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
141

  
142
	#rm tests/support/gitfs.py || die
141 143
	rm tests/pytests/functional/transport/server/test_req_channel.py || die
142 144
	rm tests/pytests/functional/utils/test_async_event_publisher.py || die
143 145
	rm tests/pytests/functional/runners/test_winrepo.py || die
146
	rm tests/unit/netapi/rest_tornado/test_saltnado.py || die
144 147

  
145 148
	# tests that require network access
146 149
	rm tests/unit/{states,modules}/test_zcbuildout.py || die
......
191 194
		# needs root
192 195
		tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
193 196
		# don't like sandbox
194
		tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_has_ip
195
		tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_init
196
		tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_ready
197
		tests/unit/modules/test_win_ip.py::WinShadowTestCase::test_disable
198
		tests/unit/modules/test_win_ip.py::WinShadowTestCase::test_enable
199
		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_finished_is_set_before_events_return_then_no_data_should_be_returned
200
		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_finished_then_all_collected_data_should_be_returned
201
		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_timed_out_is_set_before_other_events_are_completed_then_result_should_be_empty_dictionary
202
		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_timed_out_then_all_collected_data_should_be_returned
203
		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_min_wait_time_has_not_passed_then_disbatch_should_not_return_expected_data_until_time_has_passed
204
		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_minions_all_return_then_all_collected_data_should_be_returned
205
		tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis
206
		tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode
197
		tests/pytests/functional/cli/test_salt.py::test_versions_report
198
		tests/unit/utils/test_vt.py::test_split_multibyte_characters_unicode
199
		tests/unit/utils/test_vt.py::test_split_multibyte_characters_shiftjis
207 200
		tests/pytests/unit/utils/test_vt.py::test_log_sanitize
208
		tests/pytests/unit/test_master.py::test_fileserver_duration
201
		tests/pytests/unit/client/ssh/test_single.py::test_run_with_pre_flight_args
209 202
		tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
203
		tests/pytests/unit/test_template.py::test_compile_template_str_mkstemp_cleanup
204
		tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_deferred_write_on_flush
205
		tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_sync_with_handlers
206
		tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
210 207
		tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
211 208
		tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
212 209
		tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
Thank you!