Skip to content

Revert "Remove chardet version upper limit" to bring back upper limit <= 5.0.0 on chardet #7057

Merged
yarikoptic merged 2 commits into
datalad:maintfrom
yarikoptic:rf-chardet
Sep 23, 2022
Merged

Revert "Remove chardet version upper limit" to bring back upper limit <= 5.0.0 on chardet #7057
yarikoptic merged 2 commits into
datalad:maintfrom
yarikoptic:rf-chardet

Conversation

@yarikoptic

Copy link
Copy Markdown
Member

This reverts commit 0f27cd5.

Original change sounded kosher and "we agreed" with reasoning but original PR #7029 for some reason did not have Travis CI runs and now after it was merged we keep getting tests failed when submitting PRs against maint with failures like

____________________________ test_run_datalad_help _____________________________
[gw0] linux -- Python 3.8.6 /tmp/dl-miniconda-jm48jjoo/bin/python

	@assert_cwd_unchanged
	def test_run_datalad_help():
		out, err = check_run_and_get_output("datalad --help")
		ok_startswith(out, "Usage: ")
		# There could be a warning from coverage that no data was collected, should be benign
		lines = [l for l in err.split(os.linesep) if ('no-data-collected' not in l) and l]
>       eq_(lines, [])

../datalad/tests/test_installed.py:47:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

first = ["/tmp/dl-miniconda-jm48jjoo/lib/python3.8/site-packages/requests/__init__.py:102: RequestsDependencyWarning: urllib3 ...ported version!", '  warnings.warn("urllib3 ({}) or chardet ({})/charset_normalizer ({}) doesn\'t match a supported "']
second = [], msg = None

	def assert_equal(first, second, msg=None):
		if msg is None:
>           assert first == second
E           assert ['/tmp/dl-min... supported "'] == []
E             Left contains 2 more items, first extra item: "/tmp/dl-miniconda-jm48jjoo/lib/python3.8/site-packages/requests/__init__.py:102: RequestsDependencyWarning: urllib3 (1.26.8) or chardet (5.0.0)/charset_normalizer (2.0.4) doesn't match a supported v
ersion!"
E             Full diff:
E               [
E             -  ,
E             +  '/tmp/dl-miniconda-jm48jjoo/lib/python3.8/site-packages/requests/__init__.py:102: '
E             +  'RequestsDependencyWarning: urllib3 (1.26.8) or chardet '
E             +  "(5.0.0)/charset_normalizer (2.0.4) doesn't match a supported version!",
E             +  '  warnings.warn("urllib3 ({}) or chardet ({})/charset_normalizer ({}) '
E             +  'doesn\'t match a supported "',
E               ]

../datalad/tests/utils_pytest.py:107: AssertionError

@kimsin98 feel welcome to reincarnate #7029 but we should make sure it doesn't break testing again -- there must be more to the story.

This reverts commit 0f27cd5.

Original change sounded kosher and "we agreed" with reasoning but original PR
datalad#7029 for some reason did not have
Travis CI runs and now after it was merged we keep getting tests failed when
submitting PRs against maint with failures like

	____________________________ test_run_datalad_help _____________________________
	[gw0] linux -- Python 3.8.6 /tmp/dl-miniconda-jm48jjoo/bin/python

		@assert_cwd_unchanged
		def test_run_datalad_help():
			out, err = check_run_and_get_output("datalad --help")
			ok_startswith(out, "Usage: ")
			# There could be a warning from coverage that no data was collected, should be benign
			lines = [l for l in err.split(os.linesep) if ('no-data-collected' not in l) and l]
	>       eq_(lines, [])

	../datalad/tests/test_installed.py:47:
	_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

	first = ["/tmp/dl-miniconda-jm48jjoo/lib/python3.8/site-packages/requests/__init__.py:102: RequestsDependencyWarning: urllib3 ...ported version!", '  warnings.warn("urllib3 ({}) or chardet ({})/charset_normalizer ({}) doesn\'t match a supported "']
	second = [], msg = None

		def assert_equal(first, second, msg=None):
			if msg is None:
	>           assert first == second
	E           assert ['/tmp/dl-min... supported "'] == []
	E             Left contains 2 more items, first extra item: "/tmp/dl-miniconda-jm48jjoo/lib/python3.8/site-packages/requests/__init__.py:102: RequestsDependencyWarning: urllib3 (1.26.8) or chardet (5.0.0)/charset_normalizer (2.0.4) doesn't match a supported v
	ersion!"
	E             Full diff:
	E               [
	E             -  ,
	E             +  '/tmp/dl-miniconda-jm48jjoo/lib/python3.8/site-packages/requests/__init__.py:102: '
	E             +  'RequestsDependencyWarning: urllib3 (1.26.8) or chardet '
	E             +  "(5.0.0)/charset_normalizer (2.0.4) doesn't match a supported version!",
	E             +  '  warnings.warn("urllib3 ({}) or chardet ({})/charset_normalizer ({}) '
	E             +  'doesn\'t match a supported "',
	E               ]

	../datalad/tests/utils_pytest.py:107: AssertionError
@yarikoptic yarikoptic added the CHANGELOG-missing When a PR's description does not contain a changelog item, yet. label Sep 22, 2022
@codecov

codecov Bot commented Sep 22, 2022

Copy link
Copy Markdown

Codecov Report

Base: 75.05% // Head: 76.17% // Increases project coverage by +1.12% 🎉

Coverage data is based on head (52ab90f) compared to base (5128733).
Patch has no changes to coverable lines.

Additional details and impacted files
@@            Coverage Diff             @@
##            maint    #7057      +/-   ##
==========================================
+ Coverage   75.05%   76.17%   +1.12%     
==========================================
  Files         354      354              
  Lines       58927    58940      +13     
  Branches     6615     6615              
==========================================
+ Hits        44226    44896     +670     
+ Misses      14687    14030     -657     
  Partials       14       14              
Impacted Files Coverage Δ
datalad/customremotes/tests/test_datalad.py 87.23% <0.00%> (-1.90%) ⬇️
datalad/_version.py 45.68% <0.00%> (-0.28%) ⬇️
datalad/distribution/create_sibling.py 60.48% <0.00%> (-0.15%) ⬇️
datalad/cli/common_args.py 100.00% <0.00%> (ø)
datalad/tests/test_dochelpers.py 100.00% <0.00%> (ø)
datalad/support/annexrepo.py 75.55% <0.00%> (+0.05%) ⬆️
datalad/support/gitrepo.py 84.25% <0.00%> (+0.05%) ⬆️
datalad/support/tests/test_network.py 69.09% <0.00%> (+0.07%) ⬆️
datalad/customremotes/tests/test_archives.py 89.36% <0.00%> (+0.07%) ⬆️
datalad/tests/test_utils.py 70.28% <0.00%> (+0.09%) ⬆️
... and 43 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@yarikoptic yarikoptic added the semver-internal Changes only affect the internal API label Sep 23, 2022
@github-actions github-actions Bot removed the CHANGELOG-missing When a PR's description does not contain a changelog item, yet. label Sep 23, 2022
@yarikoptic yarikoptic marked this pull request as ready for review September 23, 2022 01:37
@yarikoptic

Copy link
Copy Markdown
Member Author

if no objections, I would merge this asap (ie tomorrow) to bring CI back to sane state.

@yarikoptic

Copy link
Copy Markdown
Member Author

As promised -- merging

@yarikoptic yarikoptic merged commit cc8cfb7 into datalad:maint Sep 23, 2022
@kimsin98

kimsin98 commented Oct 6, 2022

Copy link
Copy Markdown
Contributor

For some reason, pip install requests 2.27.1 in Travis CI while the chardet version bump is in 2.28.1. Until someone can fix the discrepancy or version in Travis CI catches up, I agree we should put #7029 on hold.

@yarikoptic yarikoptic deleted the rf-chardet branch October 14, 2022 13:00
@yarikoptic-gitmate

Copy link
Copy Markdown
Collaborator

PR released in 0.17.7

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

semver-internal Changes only affect the internal API

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants