[Blends-commit] [Git][blends-team/blends][master] 10 commits: Fix Python3.12 string syntax warnings
Andreas Tille (@tille)
gitlab at salsa.debian.org
Wed Dec 11 17:29:35 GMT 2024
Andreas Tille pushed to branch master at Debian Blends Team / blends
Commits:
8799989b by Andreas Tille at 2024-12-10T18:43:44+01:00
Fix Python3.12 string syntax warnings
- - - - -
ddc34456 by Andreas Tille at 2024-12-10T18:48:52+01:00
Add FreedomBox to debian-blends-tasks
- - - - -
d639d2d1 by Andreas Tille at 2024-12-10T18:49:31+01:00
Rules-Requires-Root: no
- - - - -
bb7b06fe by Andreas Tille at 2024-12-10T18:51:00+01:00
Fix typo
- - - - -
65841775 by Andreas Tille at 2024-12-10T19:04:13+01:00
Build-Depends: texlive-lang-french
- - - - -
7b58a597 by Andreas Tille at 2024-12-10T20:05:26+01:00
Remove remainings of test suite
- - - - -
0cc3893e by Andreas Tille at 2024-12-10T20:25:28+01:00
Install French documentation
- - - - -
730ec098 by Andreas Tille at 2024-12-10T20:28:51+01:00
Upload to unstable
- - - - -
340ac325 by Andreas Tille at 2024-12-10T22:11:42+01:00
French doc is not ready for publication
- - - - -
ddb2aee9 by Andreas Tille at 2024-12-11T18:24:21+01:00
Upload to unstable
- - - - -
7 changed files:
- debian-blends-tasks.desc
- debian/blends-doc.install
- debian/changelog
- debian/control
- debian/rules
- devtools/tasks_diff
- doc/Makefile
Changes:
=====================================
debian-blends-tasks.desc
=====================================
@@ -151,3 +151,13 @@ Key:
hamradio-all
Packages: list
hamradio-tasks
+
+Task: freedombox
+Parent: debian-blends
+Section: debian-blends
+Description: FreedomBox
+ FreedomBox is a self-hosting web server to deploy social
+ applications on small machines.
+Test-new-install: show skip
+Key:
+ freedombox-setup
=====================================
debian/blends-doc.install
=====================================
@@ -1 +1,2 @@
-doc/en/html/*.html usr/share/doc/blends-doc/html
+doc/en/html/*.html usr/share/doc/blends-doc/html
+#doc/fr/html/*.html usr/share/doc/blends-doc/html/fr
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+blends (0.7.8) unstable; urgency=medium
+
+ [ Andreas Tille ]
+ * Fix Python3.12 string syntax warnings
+ * Rules-Requires-Root: no
+ * Build-Depends: texlive-lang-french
+ * Remove remainings of test suite
+
+ [ James Valleroy ]
+ * Add FreedomBox to debian-blends-tasks
+ Closes: #834239
+
+ -- Andreas Tille <tille at debian.org> Tue, 10 Dec 2024 21:08:56 +0100
+
blends (0.7.7) unstable; urgency=medium
* Fix spacing in tasks_diff
=====================================
debian/control
=====================================
@@ -16,11 +16,13 @@ Build-Depends-Indep: dblatex,
python3-pytest,
python3-sphinx,
w3m,
- xmlto
+ xmlto,
+# texlive-lang-french
Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/blends-team/blends
Vcs-Git: https://salsa.debian.org/blends-team/blends.git
Homepage: https://www.debian.org/blends/
+Rules-Requires-Root: no
Package: blends-dev
Architecture: all
=====================================
debian/rules
=====================================
@@ -19,6 +19,7 @@ override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
pytest-3 --doctest-modules
rm -f education # clean up test remnants
+ find . -type d -name __pycache__ | xargs rm -rf
endif
override_dh_installchangelogs:
=====================================
devtools/tasks_diff
=====================================
@@ -32,13 +32,13 @@ def clean_up_packages(packages):
# Hack: Debian Edu tasks files are using '\' at EOL which is broken
# in RFC 822 files, but blend-gen-control from blends-dev relies
# on this. So remove this stuff here for the Moment
- pkgs = re.sub('\\\\\n\s+', '', packages)
+ pkgs = re.sub(r'\\\\\n\s+', '', packages)
# Remove versions from versioned depends
- pkgs = re.sub(' *\([ ><=\.0-9]+\) *', '', pkgs)
+ pkgs = re.sub(r' *\([ ><=\.0-9]+\) *', '', pkgs)
# temporary strip spaces from alternatives ('|') to enable erroneous space handling as it was done before
- pkgs = re.sub('\s*\|\s*', '|', pkgs)
+ pkgs = re.sub(r'\s*\|\s*', '|', pkgs)
# turn alternatives ('|') into real depends for this purpose
# because we are finally interested in all alternatives
@@ -49,19 +49,19 @@ def clean_up_packages(packages):
for depl in pkgslist:
dl = depl.strip()
if dl != '': # avoid confusion when ',' is at end of line
- if re.search('\s', dl):
+ if re.search(r'\s', dl):
#logger.error("Blend %s task %s: Syntax error '%s'" % (blend, task, dl))
# trying to fix the syntax error after issuing error message
- dlspaces = re.sub('\s+', ',', dl).split(',')
+ dlspaces = re.sub(r'\s+', ',', dl).split(',')
for dls in dlspaces:
pkgs_in_one_line.append(dls.strip())
#logger.info("Blend %s task %s: Found '%s' package inside broken syntax string - please fix task file anyway" % (blend, task, dls.strip()))
else:
# in case we have to deal with a set of alternatives
- if re.search('\|', dl):
+ if re.search(r'\|', dl):
#for da in dl.split('|'):
# deps_in_one_line.append(da)
- dl = re.sub('\|', ' | ', dl)
+ dl = re.sub(r'\|', ' | ', dl)
pkgs_in_one_line.append(dl)
# self.inject_package_alternatives(blend, task, strength, dl)
=====================================
doc/Makefile
=====================================
@@ -4,12 +4,13 @@
## ----------------------------------------------------------------------
## Document definitions
-doc_lang := en fr
+doc_lang := en
+# doc_lang := en fr
doc_name := debian-blends
doc_xml := $(shell for l in $(doc_lang); do echo $(doc_name).$$l.xml; done)
doc_xml_source := $(shell find $$l -name "*.xml")
-po_files := $(shell ls *.po)
-mo_files := $(patsubst %.po, %/LC_MESSAGES/blends.mo, $(po_files))
+#po_files := $(shell ls *.po)
+#mo_files := $(patsubst %.po, %/LC_MESSAGES/blends.mo, $(po_files))
translated := $(shell for l in $$(echo $(doc_lang) | sed 's/en//'); do for f in en/*.xml; do echo $$l/$$(basename $$f); done; done)
sources := $(shell find . -name "*.xml")
@@ -53,7 +54,7 @@ validate: $(doc_xml)
xmllint --valid --noout $$f; \
done
-update_po: $(po_files)
+# update_po: $(po_files)
blends.pot: $(doc_xml_source)
../devtools/blend-doc-makepot en > $@
@@ -78,7 +79,7 @@ translate: $(mo_files)
[ $$l != "en" ] && ../devtools/blend-doc-translate $$l; \
done
-html: translate $(doc_html)
+html: $(doc_html)
$(doc_html) $(doc_html_en): $(doc_xml) $(sources)
for l in $(doc_lang); do \
@@ -87,14 +88,14 @@ $(doc_html) $(doc_html_en): $(doc_xml) $(sources)
$(LOCALE) xmlto --skip-validation -o $$d -x $(doc_name).xsl html $$f; \
done
-txt $(doc_txt): translate $(doc_xml)
+txt $(doc_txt): $(doc_xml)
for l in $(doc_lang); do \
f=$(doc_name).$$l.xml; d=$$l/txt; \
mkdir -p $$d; \
$(LOCALE) xmlto --skip-validation $(doc_txt_params) -o $$d txt $$f; \
done
-ps $(doc_ps): translate $(doc_xml)
+ps $(doc_ps): $(doc_xml)
for l in $(doc_lang); do \
f=$(doc_name).$$l.xml; d=$$l/ps; \
mkdir -p $$d; \
@@ -102,7 +103,7 @@ ps $(doc_ps): translate $(doc_xml)
done
-pdf $(doc_pdf): translate $(doc_xml)
+pdf $(doc_pdf): $(doc_xml)
for l in $(doc_lang); do \
f=$(doc_name).$$l.xml; d=$$l/pdf; \
mkdir -p $$d; \
@@ -110,7 +111,7 @@ pdf $(doc_pdf): translate $(doc_xml)
done
-dvi $(doc_dvi): translate $(doc_xml)
+dvi $(doc_dvi): $(doc_xml)
for l in $(doc_lang); do \
f=$(doc_name).$$l.xml; d=$$l/dvi; \
mkdir -p $$d; \
@@ -130,10 +131,10 @@ clean:
$(RMR) $$l/$$d; \
done; \
done
- find . -name "*~" -o name "*.mo" -exec $(RMR) {} \;
+ find . -name "*~" -o -name "*.mo" -exec $(RMR) {} \;
rm -f blends.pot
distclean:
make clean
-.PHONY: all publish clean distclean validate translate update_mo update_po
+.PHONY: all publish clean distclean validate # translateu update_mo update_po
View it on GitLab: https://salsa.debian.org/blends-team/blends/-/compare/666cc4f74a9ff2ce11d69b8c3809bd911f4e9fd2...ddb2aee9caefd30422431161348ea05f9783358b
--
View it on GitLab: https://salsa.debian.org/blends-team/blends/-/compare/666cc4f74a9ff2ce11d69b8c3809bd911f4e9fd2...ddb2aee9caefd30422431161348ea05f9783358b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/blends-commit/attachments/20241211/b0d00897/attachment-0001.htm>
More information about the Blends-commit
mailing list