Diff salt-3005.1-r1 with a salt-3005.3

/usr/portage/app-admin/salt/salt-3005.3.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 ~arm ~arm64 ~riscv ~x86"
21 21
fi
22 22

  
23 23
LICENSE="Apache-2.0"
......
31 31
RDEPEND="
32 32
	sys-apps/pciutils
33 33
	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
34
	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
34
	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
35 35
	dev-python/jmespath[${PYTHON_USEDEP}]
36 36
	dev-python/libnacl[${PYTHON_USEDEP}]
37 37
	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
38 38
	>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
39 39
	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
40
	dev-python/pyyaml[${PYTHON_USEDEP}]
41
	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
42
	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
40
	>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
41
	>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
42
	>=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
43 43
	dev-python/setuptools[${PYTHON_USEDEP}]
44 44
	dev-python/tomli[${PYTHON_USEDEP}]
45 45
	dev-python/watchdog[${PYTHON_USEDEP}]
......
56 56
	)
57 57
	openssl? (
58 58
		dev-libs/openssl:0=[-bindist(-)]
59
		dev-python/pyopenssl[${PYTHON_USEDEP}]
59
		>=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}]
60 60
	)
61 61
	raet? (
62 62
		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
......
87 87
		${RDEPEND}
88 88
		dev-python/apache-libcloud[${PYTHON_USEDEP}]
89 89
		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
90
		dev-python/certifi[${PYTHON_USEDEP}]
90
		>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
91 91
		dev-python/cherrypy[${PYTHON_USEDEP}]
92 92
		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
93 93
		dev-python/mako[${PYTHON_USEDEP}]
94 94
		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
95 95
		>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
96
		dev-python/passlib
96
		dev-python/passlib[${PYTHON_USEDEP}]
97 97
		dev-python/pip[${PYTHON_USEDEP}]
98
		dev-python/pyopenssl[${PYTHON_USEDEP}]
99
		>=dev-python/pytest-7.0.1[${PYTHON_USEDEP}]
98
		>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
99
		>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
100 100
		>=dev-python/pytest-salt-factories-1.0.0_rc17[${PYTHON_USEDEP}]
101 101
		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
102 102
		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
......
123 123
	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
124 124
	"${FILESDIR}/salt-3002-tests.patch"
125 125
	"${FILESDIR}/salt-3003.1-tests.patch"
126
	"${FILESDIR}/salt-3005-relax-pyzmq-dep.patch"
127 126
	"${FILESDIR}/salt-3005-tests.patch"
128 127
	"${FILESDIR}/salt-3005.1-no-entry-points.patch"
129 128
	"${FILESDIR}/salt-3005.1-importlib-metadata-5-r1.patch"
130 129
	"${FILESDIR}/salt-3005.1-tests.patch"
131 130
	"${FILESDIR}/salt-3005.1-modules-file-python-3.11-host.patch"
131
	"${FILESDIR}/salt-3006.2-tests.patch"
132 132
)
133 133

  
134 134
python_prepare_all() {
......
182 182
}
183 183

  
184 184
python_test() {
185
	# testsuite likes lots of files
186
	ulimit -n 4096 || die
187

  
188
	local -a disable_tests=(
185
	local -a EPYTEST_DESELECT=(
189 186
		# doesn't like the distutils warning
190
		batch_retcode
191
		multiple_modules_in_batch
187
		tests/pytests/integration/cli/test_batch.py::test_batch_retcode
188
		tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
192 189
		# hangs indefinitely
193
		master_type_disable
190
		tests/pytests/unit/test_minion.py::test_master_type_disable
194 191
		# needs root
195
		runas_env_sudo_group
192
		tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
196 193
		# don't like sandbox
197
		split_multibyte_characters_{shiftjis,unicode}
198
		# doesn't like sandbox env
199
		log_sanitize
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
207
		tests/pytests/unit/utils/test_vt.py::test_log_sanitize
208
		tests/pytests/unit/test_master.py::test_fileserver_duration
209
		tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
210
		tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
211
		tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
212
		tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
213
		tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
214
		tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
215
		tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
200 216
	)
201
	local textexpr
202
	testexpr=$(printf 'not %s and ' "${disable_tests[@]}")
217

  
218
	# testsuite likes lots of files
219
	ulimit -n 4096 || die
203 220

  
204 221
	# ${T} is too long a path for the tests to work
205 222
	local TMPDIR
......
213 230
		addwrite "${TMPDIR}"
214 231

  
215 232
		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
216
			"${EPYTHON}" -m pytest -vv -k "${testexpr%and }" \
217
			|| die "testing failed with ${EPYTHON}"
233
			epytest
218 234
	)
219 235
}
Thank you!