Page MenuHomeSoftware Heritage
Differential D6855

Pin mypy and drop type annotations which makes mypy unhappy
ClosedPublic
Actions

Authored by ardumont on Dec 16 2021, 3:19 PM.

Details

Reviewers
None
Group Reviewers
Reviewers
Maniphest Tasks
T3812: Fix builds broken by mypy 0.920
Commits
rDWAPPS7ae38cf0568c: Pin mypy and drop type annotations which makes mypy unhappy
Summary

This also fixes an actual mistyped result.

Related to T3812

Test Plan

tox

Diff Detail

Event Timeline

ardumont created this revision.Dec 16 2021, 3:19 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptDec 16 2021, 3:19 PM
This revision was not accepted when it landed; it landed in state Draft.Dec 16 2021, 3:26 PM
This revision was landed with ongoing or failed builds.
Closed by commit rDWAPPS7ae38cf0568c: Pin mypy and drop type annotations which makes mypy unhappy (authored by ardumont). · Explain Why
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDWAPPS7ae38cf0568c: Pin mypy and drop type annotations which makes mypy unhappy.
swh-public-ci added a comment.Dec 16 2021, 3:34 PM

Build is green

Patch application report for D6855 (id=24846)

Rebasing onto 615ef02ed9...

Current branch diff-target is up to date.
Changes applied before test
commit 7ae38cf0568c80a916949606fa154f3620a55475
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Dec 16 15:17:54 2021 +0100

    Pin mypy and drop type annotations which makes mypy unhappy
    
    Related to T3812

See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1271/ for more details.

Harbormaster completed remote builds in B25688: Diff 24846.Dec 16 2021, 3:34 PM

Revision Contents
Changeset List

PathSizeCoverage (All)Coverage (Touched)
swh/
3 lines--
web/
3 lines100%
Loading...
api/
2 lines100%
Loading...
2 lines--

Diff 24846

View Options

swh/__init__.py

Show First 20 Lines • Show All 341 Lines • ▼ Show 20 Lines directory_swhid = SWHID(
object_type="directory", object_id=hash_to_hex(revision.directory) object_type="directory", object_id=hash_to_hex(revision.directory)
) )
metadata_authority = MetadataAuthority( metadata_authority = MetadataAuthority(
type=MetadataAuthorityType.FORGE, url="https://pypi.org/", type=MetadataAuthorityType.FORGE, url="https://pypi.org/",
) )
expected_metadata = [ expected_metadata = [
RawExtrinsicMetadata( RawExtrinsicMetadata(
type=MetadataTargetType.DIRECTORY, type=MetadataTargetType.DIRECTORY,
id=directory_swhid, target=directory_swhid,
authority=metadata_authority, authority=metadata_authority,
fetcher=MetadataFetcher( fetcher=MetadataFetcher(
name="swh.loader.package.pypi.loader.PyPILoader", version=__version__, name="swh.loader.package.pypi.loader.PyPILoader", version=__version__,
), ),
discovery_date=loader.visit_date, discovery_date=loader.visit_date,
format="pypi-project-json", format="pypi-project-json",
metadata=json.dumps( metadata=json.dumps(
json.loads(_0805nexter_api_info)["releases"]["1.2.0"][0] json.loads(_0805nexter_api_info)["releases"]["1.2.0"][0]
▲ Show 20 Lines • Show All 520 Lines • Show Last 20 Lines
View Options

swh/web/__init__.py

Show First 20 Lines • Show All 341 Lines • ▼ Show 20 Lines directory_swhid = SWHID(
object_type="directory", object_id=hash_to_hex(revision.directory) object_type="directory", object_id=hash_to_hex(revision.directory)
) )
metadata_authority = MetadataAuthority( metadata_authority = MetadataAuthority(
type=MetadataAuthorityType.FORGE, url="https://pypi.org/", type=MetadataAuthorityType.FORGE, url="https://pypi.org/",
) )
expected_metadata = [ expected_metadata = [
RawExtrinsicMetadata( RawExtrinsicMetadata(
type=MetadataTargetType.DIRECTORY, type=MetadataTargetType.DIRECTORY,
id=directory_swhid, target=directory_swhid,
authority=metadata_authority, authority=metadata_authority,
fetcher=MetadataFetcher( fetcher=MetadataFetcher(
name="swh.loader.package.pypi.loader.PyPILoader", version=__version__, name="swh.loader.package.pypi.loader.PyPILoader", version=__version__,
), ),
discovery_date=loader.visit_date, discovery_date=loader.visit_date,
format="pypi-project-json", format="pypi-project-json",
metadata=json.dumps( metadata=json.dumps(
json.loads(_0805nexter_api_info)["releases"]["1.2.0"][0] json.loads(_0805nexter_api_info)["releases"]["1.2.0"][0]
▲ Show 20 Lines • Show All 520 Lines • Show Last 20 Lines
View Options

swh/web/api/apiresponse.py

Show First 20 Lines • Show All 341 Lines • ▼ Show 20 Lines directory_swhid = SWHID(
object_type="directory", object_id=hash_to_hex(revision.directory) object_type="directory", object_id=hash_to_hex(revision.directory)
) )
metadata_authority = MetadataAuthority( metadata_authority = MetadataAuthority(
type=MetadataAuthorityType.FORGE, url="https://pypi.org/", type=MetadataAuthorityType.FORGE, url="https://pypi.org/",
) )
expected_metadata = [ expected_metadata = [
RawExtrinsicMetadata( RawExtrinsicMetadata(
type=MetadataTargetType.DIRECTORY, type=MetadataTargetType.DIRECTORY,
id=directory_swhid, target=directory_swhid,
authority=metadata_authority, authority=metadata_authority,
fetcher=MetadataFetcher( fetcher=MetadataFetcher(
name="swh.loader.package.pypi.loader.PyPILoader", version=__version__, name="swh.loader.package.pypi.loader.PyPILoader", version=__version__,
), ),
discovery_date=loader.visit_date, discovery_date=loader.visit_date,
format="pypi-project-json", format="pypi-project-json",
metadata=json.dumps( metadata=json.dumps(
json.loads(_0805nexter_api_info)["releases"]["1.2.0"][0] json.loads(_0805nexter_api_info)["releases"]["1.2.0"][0]
▲ Show 20 Lines • Show All 520 Lines • Show Last 20 Lines
View Options

tox.ini

Show First 20 Lines • Show All 341 Lines • ▼ Show 20 Lines directory_swhid = SWHID(
object_type="directory", object_id=hash_to_hex(revision.directory) object_type="directory", object_id=hash_to_hex(revision.directory)
) )
metadata_authority = MetadataAuthority( metadata_authority = MetadataAuthority(
type=MetadataAuthorityType.FORGE, url="https://pypi.org/", type=MetadataAuthorityType.FORGE, url="https://pypi.org/",
) )
expected_metadata = [ expected_metadata = [
RawExtrinsicMetadata( RawExtrinsicMetadata(
type=MetadataTargetType.DIRECTORY, type=MetadataTargetType.DIRECTORY,
id=directory_swhid, target=directory_swhid,
authority=metadata_authority, authority=metadata_authority,
fetcher=MetadataFetcher( fetcher=MetadataFetcher(
name="swh.loader.package.pypi.loader.PyPILoader", version=__version__, name="swh.loader.package.pypi.loader.PyPILoader", version=__version__,
), ),
discovery_date=loader.visit_date, discovery_date=loader.visit_date,
format="pypi-project-json", format="pypi-project-json",
metadata=json.dumps( metadata=json.dumps(
json.loads(_0805nexter_api_info)["releases"]["1.2.0"][0] json.loads(_0805nexter_api_info)["releases"]["1.2.0"][0]
▲ Show 20 Lines • Show All 520 Lines • Show Last 20 Lines
About · Developer information · Legal