Paths

Table of Contentst

-
.pre-commit-config.yaml
11/13
tox.ini

Differential D8720

pre-commit, tox: Bump pre-commit, codespell, black and flake8
ClosedPublic
Actions

Authored by douardda on Oct 18 2022, 7:15 PM.

Details

Reviewers

None

Group Reviewers

Reviewers

Commits

rDLDBZR7b0f9a9766ba: pre-commit, tox: Bump pre-commit, codespell, black and flake8

Summary

pre-commit from 4.1.0 to 4.3.0,
codespell from 2.2.1 to 2.2.2,
black from 22.3.0 to 22.10.0 and
flake8 from 4.0.1 to 5.0.4. Also freeze flake8 dependencies.

Also change flake8's repo config to github (the gitlab mirror
being outdated).

Diff Detail

Repository

rDLDBZR BZR loader

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

douardda created this revision.Oct 18 2022, 7:15 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptOct 18 2022, 7:15 PM

Build is green

Patch application report for D8720 (id=31444)

Rebasing onto ba7ebcba87...

Current branch diff-target is up to date.

Changes applied before test

commit 7b0f9a9766ba4debe138de395419e042ef0d1ba2
Author: David Douard <david.douard@sdfa3.org>
Date:   Tue Oct 18 18:20:53 2022 +0200

    pre-commit, tox: Bump pre-commit, codespell, black and flake8
    
    - pre-commit from 4.1.0 to 4.3.0,
    - codespell from 2.2.1 to 2.2.2,
    - black from 22.3.0 to 22.10.0 and
    - flake8 from 4.0.1 to 5.0.4. Also freeze flake8 dependencies.
    
    Also change flake8's repo config to github (the gitlab mirror
    being outdated).

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

Harbormaster completed remote builds in B32390: Diff 31444.Oct 18 2022, 7:24 PM

douardda requested review of this revision.Oct 18 2022, 7:24 PM

This revision was not accepted when it landed; it landed in state Needs Review.Oct 18 2022, 7:52 PM

Closed by commit rDLDBZR7b0f9a9766ba: pre-commit, tox: Bump pre-commit, codespell, black and flake8 (authored by douardda). · Explain Why

This revision was automatically updated to reflect the committed changes.

douardda added a commit: rDLDBZR7b0f9a9766ba: pre-commit, tox: Bump pre-commit, codespell, black and flake8.

Revision Contents
Changeset List

Path

Size

.pre-commit-config.yaml

12 lines

tox.ini

7 lines

Diff 31479

View Options

.pre-commit-config.yaml

Show First 20 Lines • Show All 910 Lines • ▼ Show 20 Lines	def origin_visit_get_by(self, origin: str, visit: int) -> Optional[Dict[str, Any]]:
return None		return None

def origin_visit_get_latest(		def origin_visit_get_latest(
self,		self,
origin: str,		origin: str,
type: Optional[str] = None,		type: Optional[str] = None,
allowed_statuses: Optional[List[str]] = None,		allowed_statuses: Optional[List[str]] = None,
require_snapshot: bool = False,		require_snapshot: bool = False,
) -> Optional[Dict[str, Any]]:		) -> Optional[OriginVisit]:
ori = self._origins.get(origin)		ori = self._origins.get(origin)
if not ori:		if not ori:
return None		return None
visits = self._origin_visits[ori.url]

visits = [		visits = sorted(
self._origin_visit_get_updated(visit.origin, visit.visit)		self._origin_visits[ori.url], key=lambda v: v.date, reverse=True,
for visit in visits		)
if visit is not None		for visit in visits:
]		if type is not None and visit.type != type:
		continue
		visit_statuses = self._origin_visit_statuses[origin, visit.visit]

		vlorentzUnsubmitted Done Inline Actions `visit_statuses` vlorentz: `visit_statuses`
		ardumontAuthorUnsubmitted Done Inline Actions It was too long and i was annoyed by it... ardumont: It was too long and i was annoyed by it...
		vlorentzUnsubmitted Done Inline Actions I get that, but a abbreviations harm readability vlorentz: I get that, but a abbreviations harm readability
		ardumontAuthorUnsubmitted Done Inline Actions oh don't worry, i'm gonna change it. You fine about the implementation otherwise? I tried to keep as much as possible the existing implementation pattern. I initially sorted the visit_statuses as well (order by date desc) and kept the list comprehension filterings as here. And then just returned the first visit_status of the list (since it should then be the max). I changed it because the sorted stanza is a bit hard to read (due to the annoying copy...). ardumont: oh don't worry, i'm gonna change it. You fine about the implementation otherwise? I tried to…
		vlorentzUnsubmitted Done Inline Actions yes, it's fine. vlorentz: yes, it's fine.
		vlorentzUnsubmitted Done Inline Actions Actually, why do we need deepcopies? Aren't they immutable objects now? vlorentz: Actually, why do we need deepcopies? Aren't they immutable objects now?
		ardumontAuthorUnsubmitted Done Inline Actions afaiui, in-memory's storage implementation regarding its data are lists, aren't they? ardumont: afaiui, in-memory's storage implementation regarding its data are lists, aren't they?
		ardumontAuthorUnsubmitted Done Inline Actions self._origin_visits = {} self._origin_visit_statuses: Dict[Tuple[str, int], List[OriginVisitStatus]] = {} ardumont: ``` self._origin_visits = {} self._origin_visit_statuses: Dict[Tuple[str, int]…
		ardumontAuthorUnsubmitted Done Inline Actions but yes for origin_visit_statuses here, it's unneeded (left-over from the other implementation i told you about ;) ardumont: but yes for origin_visit_statuses here, it's unneeded (left-over from the other implementation…
		vlorentzUnsubmitted Not Done Inline Actions It's also not needed for visits, because we don't modify the list nor return it vlorentz: It's also not needed for visits, because we don't modify the list nor return it
		ardumontAuthorUnsubmitted Done Inline Actions we sort it, don't that impact it? ardumont: we sort it, don't that impact it?
		vlorentzUnsubmitted Not Done Inline Actions You're confusing `sorted()` with `.sort()`. The former makes a shallow copy, the latter sorts in-place. vlorentz: You're confusing `sorted()` with `.sort()`. The former makes a shallow copy, the latter sorts…
		ardumontAuthorUnsubmitted Done Inline Actions indeed, thanks! ardumont: indeed, thanks!
if type is not None:
visits = [visit for visit in visits if visit["type"] == type]
if allowed_statuses is not None:		if allowed_statuses is not None:
visits = [visit for visit in visits if visit["status"] in allowed_statuses]		visit_statuses = [
		vs for vs in visit_statuses if vs.status in allowed_statuses
		]
if require_snapshot:		if require_snapshot:
visits = [visit for visit in visits if visit["snapshot"]]		visit_statuses = [vs for vs in visit_statuses if vs.snapshot]

visit = max(visits, key=lambda v: (v["date"], v["visit"]), default=None)		if visit_statuses: # we found visit statuses matching criteria
if visit is None:		visit_status = max(visit_statuses, key=lambda vs: (vs.date, vs.visit))
return None		assert visit.origin == visit_status.origin
		assert visit.visit == visit_status.visit
return visit		return visit

		return None

def origin_visit_status_get_latest(		def origin_visit_status_get_latest(
self,		self,
origin_url: str,		origin_url: str,
visit: int,		visit: int,
allowed_statuses: Optional[List[str]] = None,		allowed_statuses: Optional[List[str]] = None,
require_snapshot: bool = False,		require_snapshot: bool = False,
) -> Optional[OriginVisitStatus]:		) -> Optional[OriginVisitStatus]:
ori = self._origins.get(origin_url)		ori = self._origins.get(origin_url)
▲ Show 20 Lines • Show All 259 Lines • Show Last 20 Lines

View Options

tox.ini

Show First 20 Lines • Show All 910 Lines • ▼ Show 20 Lines	def origin_visit_get_by(self, origin: str, visit: int) -> Optional[Dict[str, Any]]:
return None		return None

def origin_visit_get_latest(		def origin_visit_get_latest(
self,		self,
origin: str,		origin: str,
type: Optional[str] = None,		type: Optional[str] = None,
allowed_statuses: Optional[List[str]] = None,		allowed_statuses: Optional[List[str]] = None,
require_snapshot: bool = False,		require_snapshot: bool = False,
) -> Optional[Dict[str, Any]]:		) -> Optional[OriginVisit]:
ori = self._origins.get(origin)		ori = self._origins.get(origin)
if not ori:		if not ori:
return None		return None
visits = self._origin_visits[ori.url]

visits = [		visits = sorted(
self._origin_visit_get_updated(visit.origin, visit.visit)		self._origin_visits[ori.url], key=lambda v: v.date, reverse=True,
for visit in visits		)
if visit is not None		for visit in visits:
]		if type is not None and visit.type != type:
		continue
		visit_statuses = self._origin_visit_statuses[origin, visit.visit]

		vlorentzUnsubmitted Done Inline Actions `visit_statuses` vlorentz: `visit_statuses`
		ardumontAuthorUnsubmitted Done Inline Actions It was too long and i was annoyed by it... ardumont: It was too long and i was annoyed by it...
		vlorentzUnsubmitted Done Inline Actions I get that, but a abbreviations harm readability vlorentz: I get that, but a abbreviations harm readability
		ardumontAuthorUnsubmitted Done Inline Actions oh don't worry, i'm gonna change it. You fine about the implementation otherwise? I tried to keep as much as possible the existing implementation pattern. I initially sorted the visit_statuses as well (order by date desc) and kept the list comprehension filterings as here. And then just returned the first visit_status of the list (since it should then be the max). I changed it because the sorted stanza is a bit hard to read (due to the annoying copy...). ardumont: oh don't worry, i'm gonna change it. You fine about the implementation otherwise? I tried to…
		vlorentzUnsubmitted Done Inline Actions yes, it's fine. vlorentz: yes, it's fine.
		vlorentzUnsubmitted Done Inline Actions Actually, why do we need deepcopies? Aren't they immutable objects now? vlorentz: Actually, why do we need deepcopies? Aren't they immutable objects now?
		ardumontAuthorUnsubmitted Done Inline Actions afaiui, in-memory's storage implementation regarding its data are lists, aren't they? ardumont: afaiui, in-memory's storage implementation regarding its data are lists, aren't they?
		ardumontAuthorUnsubmitted Done Inline Actions self._origin_visits = {} self._origin_visit_statuses: Dict[Tuple[str, int], List[OriginVisitStatus]] = {} ardumont: ``` self._origin_visits = {} self._origin_visit_statuses: Dict[Tuple[str, int]…
		ardumontAuthorUnsubmitted Done Inline Actions but yes for origin_visit_statuses here, it's unneeded (left-over from the other implementation i told you about ;) ardumont: but yes for origin_visit_statuses here, it's unneeded (left-over from the other implementation…
		vlorentzUnsubmitted Not Done Inline Actions It's also not needed for visits, because we don't modify the list nor return it vlorentz: It's also not needed for visits, because we don't modify the list nor return it
		ardumontAuthorUnsubmitted Done Inline Actions we sort it, don't that impact it? ardumont: we sort it, don't that impact it?
		vlorentzUnsubmitted Not Done Inline Actions You're confusing `sorted()` with `.sort()`. The former makes a shallow copy, the latter sorts in-place. vlorentz: You're confusing `sorted()` with `.sort()`. The former makes a shallow copy, the latter sorts…
		ardumontAuthorUnsubmitted Done Inline Actions indeed, thanks! ardumont: indeed, thanks!
if type is not None:
visits = [visit for visit in visits if visit["type"] == type]
if allowed_statuses is not None:		if allowed_statuses is not None:
visits = [visit for visit in visits if visit["status"] in allowed_statuses]		visit_statuses = [
		vs for vs in visit_statuses if vs.status in allowed_statuses
		]
if require_snapshot:		if require_snapshot:
visits = [visit for visit in visits if visit["snapshot"]]		visit_statuses = [vs for vs in visit_statuses if vs.snapshot]

visit = max(visits, key=lambda v: (v["date"], v["visit"]), default=None)		if visit_statuses: # we found visit statuses matching criteria
if visit is None:		visit_status = max(visit_statuses, key=lambda vs: (vs.date, vs.visit))
return None		assert visit.origin == visit_status.origin
		assert visit.visit == visit_status.visit
return visit		return visit

		return None

def origin_visit_status_get_latest(		def origin_visit_status_get_latest(
self,		self,
origin_url: str,		origin_url: str,
visit: int,		visit: int,
allowed_statuses: Optional[List[str]] = None,		allowed_statuses: Optional[List[str]] = None,
require_snapshot: bool = False,		require_snapshot: bool = False,
) -> Optional[OriginVisitStatus]:		) -> Optional[OriginVisitStatus]:
ori = self._origins.get(origin_url)		ori = self._origins.get(origin_url)
▲ Show 20 Lines • Show All 259 Lines • Show Last 20 Lines

pre-commit, tox: Bump pre-commit, codespell, black and flake8ClosedPublicActions

Details

Diff Detail

Event Timeline

Patch application report for D8720 (id=31444)

Changes applied before test

Revision ContentsChangeset List

Diff 31479

.pre-commit-config.yaml

tox.ini

pre-commit, tox: Bump pre-commit, codespell, black and flake8
ClosedPublic
Actions

Revision Contents
Changeset List