diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .pre-commit-config.yaml | 8 | ||||
| -rw-r--r-- | apt/auth.py | 1 | ||||
| -rw-r--r-- | apt/cache.py | 6 | ||||
| -rw-r--r-- | aptsources/_deb822.py | 6 | ||||
| -rw-r--r-- | data/templates/Debian.mirrors | 22 | ||||
| -rw-r--r-- | data/templates/Ubuntu.mirrors | 20 | ||||
| -rw-r--r-- | tests/test_auth.py | 1 | ||||
| -rw-r--r-- | tests/test_lp659438.py | 1 |
9 files changed, 27 insertions, 40 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d516279..876e324 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: ubuntu:noble +image: debian:unstable variables: DEBIAN_FRONTEND: noninteractive pre-commit: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ddd6c4b..79c8120 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/asottile/pyupgrade - rev: v3.15.0 + rev: v3.15.2 hooks: - id: pyupgrade args: [--py311-plus] @@ -10,15 +10,15 @@ repos: - id: isort args: ["--profile", "black", "--filter-files"] - repo: https://github.com/PyCQA/autoflake - rev: v2.2.1 + rev: v2.3.1 hooks: - id: autoflake - repo: https://github.com/psf/black - rev: 23.12.1 + rev: 24.4.0 hooks: - id: black - repo: https://github.com/pre-commit/mirrors-mypy - rev: 'v1.8.0' + rev: 'v1.9.0' hooks: - id: mypy args: [--strict] diff --git a/apt/auth.py b/apt/auth.py index 6d50616..8ae5977 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -44,7 +44,6 @@ class AptKeyIDTooShortError(AptKeyError): class TrustedKey: - """Represents a trusted key.""" def __init__(self, name: str, keyid: str, date: str) -> None: diff --git a/apt/cache.py b/apt/cache.py index cf78026..5893c0e 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -118,9 +118,9 @@ class Cache: self._callbacks2: dict[ str, list[tuple[Callable[..., Any], tuple[Any, ...], dict[Any, Any]]] ] = {} # noqa - self._weakref: weakref.WeakValueDictionary[ - str, apt.Package - ] = weakref.WeakValueDictionary() # noqa + self._weakref: weakref.WeakValueDictionary[str, apt.Package] = ( + weakref.WeakValueDictionary() + ) # noqa self._weakversions: weakref.WeakSet[Version] = weakref.WeakSet() # noqa self._changes_count = -1 self._sorted_set: list[str] | None = None diff --git a/aptsources/_deb822.py b/aptsources/_deb822.py index d3b3a7c..28593e2 100644 --- a/aptsources/_deb822.py +++ b/aptsources/_deb822.py @@ -70,12 +70,10 @@ class Section: return bool(self.tags) @typing.overload - def get(self, key: str) -> str | None: - ... + def get(self, key: str) -> str | None: ... @typing.overload - def get(self, key: str, default: T) -> T | str: - ... + def get(self, key: str, default: T) -> T | str: ... def get(self, key: str, default: T | None = None) -> T | None | str: try: diff --git a/data/templates/Debian.mirrors b/data/templates/Debian.mirrors index 1551a71..9c482a0 100644 --- a/data/templates/Debian.mirrors +++ b/data/templates/Debian.mirrors @@ -11,7 +11,6 @@ http://ftp.tu-graz.ac.at/mirror/debian/ http://mirror.alwyzon.net/debian/ #LOC:AU http://debian.mirror.digitalpacific.com.au/debian/ -http://debian.mirror.serversaustralia.com.au/debian/ http://ftp.au.debian.org/debian/ http://mirror.aarnet.edu.au/debian/ http://mirror.amaze.com.au/debian/ @@ -35,16 +34,11 @@ http://debian.mnet.bg/debian/ http://debian.telecoms.bg/debian/ http://ftp.bg.debian.org/debian/ http://ftp.uni-sofia.bg/debian/ -http://mirror.telepoint.bg/debian/ http://mirrors.netix.net/debian/ #LOC:BR -http://alcateia.ufscar.br/debian/ http://debian.c3sl.ufpr.br/debian/ http://ftp.br.debian.org/debian/ -#LOC:BY -http://ftp.by.debian.org/debian/ -http://ftp.byfly.by/debian/ -http://mirror.datacenter.by/debian/ +http://mirror.uepg.br/debian/ #LOC:CA http://debian.linux.n0c.ca/debian/ http://debian.mirror.iweb.ca/debian/ @@ -70,10 +64,8 @@ http://elmirror.cl/debian/ http://ftp.cl.debian.org/debian/ http://mirror.hnd.cl/debian/ http://mirror.insacom.cl/debian/ -http://mirror.ufro.cl/debian/ #LOC:CN http://ftp.cn.debian.org/debian/ -http://mirror.bjtu.edu.cn/debian/ http://mirror.lzu.edu.cn/debian/ http://mirror.nju.edu.cn/debian/ http://mirror.nyist.edu.cn/debian/ @@ -85,6 +77,7 @@ http://mirrors.jlu.edu.cn/debian/ http://mirrors.neusoft.edu.cn/debian/ http://mirrors.tuna.tsinghua.edu.cn/debian/ http://mirrors.ustc.edu.cn/debian/ +http://mirrors.zju.edu.cn/debian/ #LOC:CR http://debianmirror.una.ac.cr/debian/ http://mirrors.ucr.ac.cr/debian/ @@ -105,6 +98,7 @@ http://artfiles.org/debian/ http://de.mirrors.clouvider.net/debian/ http://debian.charite.de/debian/ http://debian.inf.tu-dresden.de/debian/ +http://debian.intergenia.de/debian/ http://debian.mirror.iphh.net/debian/ http://debian.mirror.lrz.de/debian/ http://debian.netcologne.de/debian/ @@ -128,7 +122,6 @@ http://mirror.23m.com/debian/ http://mirror.de.leaseweb.net/debian/ http://mirror.dogado.de/debian/ http://mirror.eu.oneandone.net/debian/ -http://mirror.fra.macarne.com/debian/ http://mirror.informatik.tu-freiberg.de/debian/ http://mirror.ipb.de/debian/ http://mirror.netzwerge.de/debian/ @@ -157,6 +150,7 @@ http://repo.ifca.es/debian/ http://softlibre.unizar.es/debian/ http://ulises.hostalia.com/debian/ #LOC:FI +http://debian.web.trex.fi/debian/ http://ftp.fi.debian.org/debian/ http://www.nic.funet.fi/debian/ #LOC:FR @@ -170,6 +164,7 @@ http://debian.univ-tlse2.fr/debian/ http://ftp.ec-m.fr/debian/ http://ftp.fr.debian.org/debian/ http://ftp.lip6.fr/pub/linux/distributions/debian/ +http://ftp.u-picardie.fr/debian/ http://ftp.u-strasbg.fr/debian/ http://ftp.univ-pau.fr/linux/mirrors/debian/ http://miroir.univ-lorraine.fr/debian/ @@ -190,7 +185,6 @@ http://mirror.lon.macarne.com/debian/ http://mirror.mythic-beasts.com/debian/ http://mirror.ox.ac.uk/debian/ http://mirror.positive-internet.com/debian/ -http://mirror.vinehost.net/debian/ http://mirrors.coreix.net/debian/ http://mirrorservice.org/sites/ftp.debian.org/debian/ http://uk.mirrors.clouvider.net/debian/ @@ -218,6 +212,7 @@ http://mr.heru.id/debian/ #LOC:IL http://debian.interhost.co.il/debian/ #LOC:IN +http://mirror.cse.iitk.ac.in/debian/ http://mirrors.iitd.ac.in/debian/ #LOC:IR http://archive.debian.petiak.ir/debian/ @@ -257,6 +252,7 @@ http://mirror.siwoo.org/debian/ http://mirror.hoster.kz/debian/ http://mirror.ps.kz/debian/ #LOC:LT +http://debian.balt.net/debian/ http://debian.mirror.vu.lt/debian/ http://ftp.lt.debian.org/debian/ http://mirror.litnet.lt/debian/ @@ -275,8 +271,6 @@ http://mirror.as43289.net/debian/ http://mirror-mk.interspace.com/debian/ http://mirror.onevip.mk/debian/ #LOC:NC -http://debian.nautile.nc/debian/ -http://ftp.nc.debian.org/debian/ http://mirror.lagoon.nc/debian/ #LOC:NL http://debian.snt.utwente.nl/debian/ @@ -338,6 +332,7 @@ http://ftpmirror1.infania.net/debian/ http://mirror.zetup.net/debian/ http://mirrors.glesys.net/debian/ #LOC:SG +http://mirror.coganng.com/debian/ http://mirror.djvg.sg/debian/ http://mirror.sg.gs/debian/ #LOC:SI @@ -359,7 +354,6 @@ http://ftp.tr.debian.org/debian/ http://debian.cs.nycu.edu.tw/debian/ http://debian.csie.ncku.edu.tw/debian/ http://debian.csie.ntu.edu.tw/debian/ -http://ftp.tku.edu.tw/debian/ http://ftp.tw.debian.org/debian/ http://opensource.nchc.org.tw/debian/ http://tw1.mirror.blendbyte.net/debian/ diff --git a/data/templates/Ubuntu.mirrors b/data/templates/Ubuntu.mirrors index bc2690c..208edbd 100644 --- a/data/templates/Ubuntu.mirrors +++ b/data/templates/Ubuntu.mirrors @@ -100,7 +100,6 @@ http://mirrors.huaweicloud.com/repository/ubuntu/ http://mirrors.njupt.edu.cn/ubuntu/ http://mirrors.sohu.com/ubuntu/ http://mirrors.yun-idc.com/ubuntu/ -https://mirror.bjtu.edu.cn/ubuntu/ https://mirror.nju.edu.cn/ubuntu/ https://mirror.nyist.edu.cn/ubuntu/ https://mirrors.bfsu.edu.cn/ubuntu/ @@ -118,8 +117,6 @@ https://repo.huaweicloud.com/ubuntu/ http://mirror.unimagdalena.edu.co/ubuntu/ http://mirrors.atlas.net.co/ubuntu/ https://edgeuno-bog2.mm.fcix.net/ubuntu/ -#LOC:CR -http://ubuntu.ucr.ac.cr/ubuntu/ #LOC:CY http://mirror.library.ucy.ac.cy/linux/ubuntu/archive/ #LOC:CZ @@ -189,7 +186,6 @@ https://mirrors.c0urier.net/linux/ubuntu/ http://mirror.cedia.org.ec/ubuntu/ http://mirror.espol.edu.ec/ubuntu/ #LOC:EE -https://archive.ubuntu.apiversa.com/ https://mirrors.xtom.ee/ubuntu/ #LOC:ES http://dafi.inf.um.es/ubuntu/ @@ -209,6 +205,7 @@ https://ubuntu.web.trex.fi/ubuntu/ #LOC:FR http://distrib-coffee.ipsl.jussieu.fr/pub/linux/ubuntu/ http://miroir.univ-lorraine.fr/ubuntu/ +http://mirror.its-tps.fr/ubuntu/ http://mirror.plusserver.com/ubuntu/ubuntu/ http://mirrors.ircam.fr/pub/ubuntu/archive/ http://ubuntu.mirror.serverloft.de/ubuntu/ @@ -222,6 +219,7 @@ https://ubuntu.mirrors.ovh.net/ubuntu/ https://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ #LOC:GB http://archive.ubuntu.com/ubuntu/ +http://archive.ubuntu.moon127.net/ http://mirror.as29550.net/archive.ubuntu.com/ http://mirror.bytemark.co.uk/ubuntu/ http://mirror.cov.ukservers.com/ubuntu/ @@ -233,11 +231,12 @@ http://mirror.vorboss.net/ubuntu-archive/ http://mirrors.coreix.net/ubuntu/ http://mirrors.melbourne.co.uk/ubuntu/ http://mirrors.ukfast.co.uk/sites/archive.ubuntu.com/ +http://ports.ubuntu.moon127.net/ http://ubuntu.mirrors.uk2.net/ubuntu/ http://ubuntu.positive-internet.com/ubuntu/ http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ https://mirror.lon.macarne.com/ubuntu/ -https://mirror.vinehost.net/ubuntu/ +https://mirrors.gethosted.online/ubuntu/ https://uk.mirrors.clouvider.net/ubuntu/ #LOC:GE http://ubuntu.grena.ge/ubuntu/ @@ -273,12 +272,11 @@ http://suro.ubaya.ac.id/ubuntu/ https://buaya.klas.or.id/ubuntu/ https://cdn.repo.cloudeka.id/ubuntu/ https://cdn.ubuntu.repo.cloudeka.id/ubuntu/ -https://linux.domainesia.com/ubuntu/ubuntu-archive/ https://mirror.amscloud.co.id/ubuntu/ https://mirror.citrahost.com/ubuntu/ https://mirror.faizuladib.com/ubuntu/ https://mirror.gi.co.id/ubuntu/ -https://mirror.nevacloud.com/ubuntu/ubuntu-archive/ +https://mirror.herza.id/ubuntu/ https://mirror.papua.go.id/ubuntu/ https://mirror.repository.id/ubuntu/ https://mirror.unair.ac.id/ubuntu/ @@ -322,11 +320,11 @@ https://ir.archive.ubuntu.com/ubuntu/ https://ir.ubuntu.sindad.cloud/ubuntu/ https://mirror.0-1.cloud/ubuntu/ https://mirror.iranserver.com/ubuntu/ -https://mirror.rasanegar.com/ubuntu/ https://mirrors.pardisco.co/ubuntu/ https://ubuntu-mirror.kimiahost.com/ https://ubuntu.bardia.tech/ https://ubuntu.hostiran.ir/ubuntuarchive/ +https://ubuntu.pars.host/ https://ubuntu.shatel.ir/ubuntu/ #LOC:IS http://ubuntu.hysing.is/ubuntu/ @@ -438,6 +436,7 @@ http://ubuntu.mirror.true.nl/ubuntu/ https://mirror.lyrahosting.com/ubuntuarchive/ https://mirror.nl.altushost.com/ubuntu/ https://mirror.nl.leaseweb.net/ubuntu/ +https://mirror.nl.mirhosting.net/ubuntu/ https://mirrors.evoluso.com/ubuntu/ https://mirrors.hostiserver.com/ubuntu/ https://mirrors.xtom.nl/ubuntu/ @@ -455,9 +454,9 @@ http://ntc.net.np/ubuntu/ http://ubuntu.ntc.net.np/ubuntu/ #LOC:NZ http://ubuntu.mirrors.theom.nz/ -http://ucmirror.canterbury.ac.nz/ubuntu/ https://mirror.2degrees.nz/ubuntu/ https://mirror.fsmg.org.nz/ubuntu/ +https://ucmirror.canterbury.ac.nz/ubuntu/ #LOC:PH http://mirror.rise.ph/ubuntu/ #LOC:PK @@ -567,13 +566,13 @@ https://mirror.twds.com.tw/ubuntu/ https://tw1.mirror.blendbyte.net/ubuntu/ https://ubuntu.ccns.ncku.edu.tw/ubuntu/ #LOC:TZ -http://deb-mirror.habari.co.tz/ubuntu/ http://mirror.aptus.co.tz/pub/ubuntuarchive/ #LOC:UA http://mirror.mirohost.net/ubuntu/ http://ubuntu.mirrors.omnilance.com/ubuntu/ http://ubuntu.org.ua/ubuntu/ http://ubuntu.volia.net/ubuntu-archive/ +https://ubuntu.ip-connect.vn.ua/ https://ubuntu.netforce.hosting/ubuntu/ #LOC:UG http://mirror.renu.ac.ug/ubuntu/ @@ -610,7 +609,6 @@ http://mirrors.advancedhosters.com/ubuntu/ http://mirrors.arpnetworks.com/Ubuntu/ http://mirrors.cat.pdx.edu/ubuntu/ http://mirrors.cmich.edu/ubuntu/ -http://mirrors.codec-cluster.org/ubuntu/ http://mirrors.liquidweb.com/ubuntu/ http://mirrors.lug.mtu.edu/ubuntu/ http://mirrors.maine.edu/ubuntu/ diff --git a/tests/test_auth.py b/tests/test_auth.py index 811cbb9..080498d 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -114,7 +114,6 @@ def normalize_key(keystr): class TestAuthKeys(testcommon.TestCase): - """Test handling of keys for signed repositories.""" def setUp(self): diff --git a/tests/test_lp659438.py b/tests/test_lp659438.py index 21ad061..16041ff 100644 --- a/tests/test_lp659438.py +++ b/tests/test_lp659438.py @@ -33,7 +33,6 @@ import apt class RegressionTestCase(testcommon.TestCase): - """Test suite for LP: #981896, LP: #659438 'Cannot locate a file for package X' """ |