Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add urllib3 v2 as network backend #292

Merged
merged 43 commits into from
Nov 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
0019125
requirements: add urllib3
R1kaB3rN Nov 29, 2024
dd24b55
pyproject: update dependencies
R1kaB3rN Nov 29, 2024
3e7ed8d
Makefile: add new build target for urllib3 v2
R1kaB3rN Nov 29, 2024
41a373c
__main__: add vendored path to PYTHONPATH
R1kaB3rN Nov 29, 2024
5298aba
umu_util: remove helper to create HTTPSConnection instances
R1kaB3rN Nov 29, 2024
bcb29d6
umu_util: add helper to compute digest and write file
R1kaB3rN Nov 29, 2024
30e5556
umu_run: refactor to use connection pools from urllib3 v2
R1kaB3rN Nov 29, 2024
b19d37b
umu_runtime: refactor to use urllib3 v2
R1kaB3rN Nov 29, 2024
ee22e58
umu_proton: refactor to use urllib3 v2
R1kaB3rN Nov 29, 2024
429e510
umu_test: add tests for _restore_umu
R1kaB3rN Nov 29, 2024
e346ab5
umu_test: add tests for setup_umu
R1kaB3rN Nov 29, 2024
436e691
umu_test: add tests for _restore_umu_platformid
R1kaB3rN Nov 29, 2024
022d385
umu_test: add tests for write_file_chunks
R1kaB3rN Nov 29, 2024
398b0c0
umu_test: update tests
R1kaB3rN Nov 29, 2024
8c13bdd
umu_test_plugins: update tests
R1kaB3rN Nov 29, 2024
b9fe434
workflows: setup venv
R1kaB3rN Nov 29, 2024
8926219
workflows: activate venv
R1kaB3rN Nov 29, 2024
4318b37
workflows: don't use fish shell
R1kaB3rN Nov 29, 2024
6838f02
workflows: don't append .sh to activate script
R1kaB3rN Nov 29, 2024
3f90154
workflows: setup venv for e2e
R1kaB3rN Nov 29, 2024
96980d1
workflows: fix venv in e2e
R1kaB3rN Nov 29, 2024
450b4bb
workflows: setup venv once
R1kaB3rN Nov 29, 2024
15b21ec
workflows: fix unit tests not running in venv
R1kaB3rN Nov 29, 2024
83b0e18
workflows: fix unit tests not running in venv
R1kaB3rN Nov 29, 2024
d6c367a
workflows: remove python 3.10 from matrix
R1kaB3rN Nov 29, 2024
b2a253d
workflows: fix mypy not running in venv
R1kaB3rN Nov 29, 2024
e75eb28
workflows: fix mypy not running in venv
R1kaB3rN Nov 29, 2024
b60384d
workflows: set python 3.11 for mypy
R1kaB3rN Nov 29, 2024
5d81fab
umu_runtime: add ignore for mypy
R1kaB3rN Nov 29, 2024
87a59aa
Makefile: fix deb build
R1kaB3rN Nov 29, 2024
04733bb
Makefile: fix format
R1kaB3rN Nov 29, 2024
0ab5838
deb: add python3-pip as build dependency
R1kaB3rN Nov 29, 2024
5ef4cb3
README: mention pip as build dependency
R1kaB3rN Nov 29, 2024
9c4515f
pyproject: add comment regarding urllib3 dep
R1kaB3rN Nov 29, 2024
45d68d7
pyproject: update comment for truststore
R1kaB3rN Nov 29, 2024
3cc3e0e
umu_runtime: update log statement
R1kaB3rN Nov 29, 2024
8b9be9a
umu_runtime: remove cached file on digest mismatch
R1kaB3rN Nov 29, 2024
790a10f
umu_runtime: update error message on digest mismatch
R1kaB3rN Nov 29, 2024
bfd6f71
umu_run: handle the digest mismatch when updating runtime
R1kaB3rN Nov 29, 2024
65048e1
umu_runtime: include the upstream link in the error message
R1kaB3rN Nov 29, 2024
aeea7b1
umu_proton: delete cached file on digest mismatch
R1kaB3rN Nov 29, 2024
34ac322
umu_runtime: extend archive file with its id to avoid corruption on r…
R1kaB3rN Nov 29, 2024
c4912ba
__main__: prefer list.insert when extending PYTHONPATH
R1kaB3rN Nov 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Makefile: add new build target for urllib3 v2
- Automatically includes urllib3 v2 in all targets
  • Loading branch information
R1kaB3rN committed Nov 29, 2024
commit 3e7ed8d35b2d247fd14ee0b1aab54f9f6f8b4afd
27 changes: 12 additions & 15 deletions Makefile.in
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ FLATPAK ?= xfalse

.PHONY: all
ifeq ($(FLATPAK), xtrue)
all: umu-dist umu-launcher
all: umu-dist umu-launcher umu-vendored
endif

.PHONY: install
@@ -30,8 +30,8 @@ SOURCE_DATE_EPOCH = $(shell LC_ALL=C date --date='@1580601600')
all: zipapp
install: zipapp-install
else
all: umu-dist umu-docs umu-launcher
install: umu-install umu-launcher-install
all: umu-dist umu-docs umu-launcher umu-vendored
install: umu-install umu-launcher-install umu-vendored-install
endif


@@ -99,20 +99,17 @@ umu-launcher-dist-install:
umu-launcher-install: umu-launcher-dist-install umu-launcher-bin-install


$(OBJDIR)/.build-umu-subprojects: | $(OBJDIR)
$(info :: Building subprojects )
pip3 install -r requirements.in -t $(OBJDIR)
$(OBJDIR)/.build-umu-vendored: | $(OBJDIR)
$(info :: Building vendored dependencies )
pip3 install urllib3 -t $(OBJDIR)

.PHONY: umu-subprojects
umu-subprojects: $(OBJDIR)/.build-umu-subprojects
.PHONY: umu-vendored
umu-vendored: $(OBJDIR)/.build-umu-vendored

umu-subprojects-install:
umu-vendored-install: umu-vendored
$(info :: Installing subprojects )
install -d $(DESTDIR)$(PYTHONDIR)
cp -r $(OBJDIR)/*-info $(DESTDIR)$(PYTHONDIR)
cp -r $(OBJDIR)/Xlib $(DESTDIR)$(PYTHONDIR)
cp -r $(OBJDIR)/filelock $(DESTDIR)$(PYTHONDIR)
cp $(OBJDIR)/six.py $(DESTDIR)$(PYTHONDIR)
install -d $(DESTDIR)$(PYTHONDIR)/umu/_vendor
cp -r $(OBJDIR)/urllib3 $(DESTDIR)$(PYTHONDIR)/umu/_vendor

$(OBJDIR):
@mkdir -p $(@)
@@ -153,7 +150,7 @@ ZIPAPP_VENV := $(OBJDIR)/zipapp_venv
$(OBJDIR)/.build-zipapp: | $(OBJDIR)
$(info :: Building umu-launcher as zipapp )
$(PYTHON_INTERPRETER) -m venv $(ZIPAPP_VENV)
. $(ZIPAPP_VENV)/bin/activate && python3 -m pip install -t "$(ZIPAPP_STAGING)" -U --no-compile .
. $(ZIPAPP_VENV)/bin/activate && python3 -m pip install -t "$(ZIPAPP_STAGING)" -U --no-compile . truststore
cp umu/__main__.py "$(ZIPAPP_STAGING)"
find "$(ZIPAPP_STAGING)" -exec touch -h -d "$(SOURCE_DATE_EPOCH)" {} +
. $(ZIPAPP_VENV)/bin/activate && python3 -m zipapp $(ZIPAPP_STAGING) -o $(ZIPAPP) -p "$(PYTHON_INTERPRETER)" -c