Merge branch 'master' into p/485/releasetourz

conf/config.yaml

@@ -1,4 +1,4 @@
-releasedate: "2024-12-04"
+release_date: "2024-12-04"
 sage: "SageMath"
 logo: "pix/logo_sagemath+icon_oldstyle.png"
 version: "10.5"

makefile

@@ -7,7 +7,7 @@ MIRROR_FILES := scripts/mirror_list scripts/metalink.helper scripts/torrent.help
 default: clean render
 
 clean:
-	- mkdir -p www && cd www && find -P -delete
+	- mkdir -p www && cd www && find . -depth -mindepth 1 -delete
 
 devmap: templates/devs.html
 
@@ -27,7 +27,7 @@ render: mirrors publications devmap
 	python render.py $(ARGS)
 
 server:
-	cd www && python -m SimpleHTTPServer 8181
+	cd www && python3 -m http.server 8181
 
 show:
 	python -c 'from webbrowser import open; open("http://127.0.0.1:8181/")'

render.py

@@ -138,7 +138,7 @@ def render():
         os.mkdir("www")
 
     log("config: {} version {} @ {}, {} mirrors and".format(
-        config["sage"], config["version"], config["releasedate"],
+        config["sage"], config["version"], config["release_date"],
         len(mirrors)))
     # for line in yaml.dump(config, indent=True, default_flow_style=False).splitlines():
     #    log("    %s" % line)

src/download-latest.html

@@ -24,12 +24,12 @@ <h1 class="narrow">Download source code distribution (devel)</h1>
  <div class="txt border">
 {#
   <strong>The latest development version is {{ version_devel }}
-    released on {{ releasedate_devel }}. 
+    released on {{ release_date_devel }}.
   </strong>
 #}
   <br/>
    {{ mirrors("devel") }}
  </div>
  </div>
 </div>
-{% endblock %}
+{% endblock %}

src/library-press.html

@@ -35,19 +35,19 @@ <h2 class="narrow">About {{ sage }}</h2>
 and a library of mathematical algorithms.
 </div>
 <div class="txt narrow">
-Mathematics is very old and encompasses many very different topics. 
+Mathematics is very old and encompasses many very different topics.
 It is hard to come up with one unique approach that suits beginners as well as experts.
-{{ sage }} tries to solve this and 
-<em>"is doing remarkably well at keeping a balance between ease-of-use for beginners and high-end users."</em> 
+{{ sage }} tries to solve this and
+<em>"is doing remarkably well at keeping a balance between ease-of-use for beginners and high-end users."</em>
 as <a href="https://groups.google.com/forum/#!msg/sage-devel/8ShuktTSzoM/oVls13-AyzgJ">David Kohel once said</a>.
 </div>
 <div class="narrow">
 Read more:
-<ul> 
+<ul>
 <li>
 <a href="./tour.html">Tour</a>,
 <a href="./tour-graphics.html">some plots</a>;
-<a href="./library-why.html">Why?</a>; 
+<a href="./library-why.html">Why?</a>;
 <a href="https://doc.sagemath.org/html/en/tutorial/tour.html">{{ sage }} Tutorial, Guided Tour</a>;
 <a href="https://wiki.sagemath.org/interact">Interact Examples</a>.
 </li><li>
@@ -79,9 +79,9 @@ <h2 class="narrow">Key Points</h2>
 <li><em>Open Development</em>:
 {{ sage }} loves curious students and researchers to examine its source code and
 it is possible to understand how each calculation is done.
-{{ sage }} fosters a community of developers and encourages them to 
+{{ sage }} fosters a community of developers and encourages them to
 <a href="./development-map.html">take part in its development</a>.
-A vital community of people not only using but also participating in development 
+A vital community of people not only using but also participating in development
 is key to a healthy ecosystem in the field of mathematical software.
 Additionally, {{ sage }} utilizes the scientific method of peer-review to double check
 each line of new source code in addition to its strict testing policies to ensure
@@ -115,7 +115,7 @@ <h2 class="narrow">Quick Facts</h2>
 <tr>
 <td>First Release 2005</td>
 <td colspan="2">Latest version {{ version }}
-    released {{ releasedate }}</td>
+    released {{ release_date }}</td>
 </tr>
 <tr>
 <td>License: GPLv2+</td>
@@ -167,7 +167,7 @@ <h1 class="narrow">Press Releases</h1>
 <h1 class="narrow">Links</h1>
 <div class="narrow txt">
 <ul>
-<li><a href="https://www.facebook.com/sagemathorg/">{{ sage }} Facebook group</a>, 
+<li><a href="https://www.facebook.com/sagemathorg/">{{ sage }} Facebook group</a>,
     <a href="https://twitter.com/sagemath">{{ sage }} Twitter page</a>.
     <a rel="me" href="https://mathstodon.xyz/@sagemath">{{ sage }} Mastodon page</a>
 <li><a href="./library-marketing.html">Marketing Material</a></li>

src/mirrors.html

@@ -41,8 +41,8 @@ <h2 class="narrow">Mirror List</h2>
  <div class="narrow txt">
   <strong>
   If the {{ sage }} icon is missing, a mirror may be down. If the date is too old compared to the first
-  (master mirror), it is outdated. The current {{ sage }} version is {{ version }} released 
-  {{ releasedate }}</strong>. 
+  (master mirror), it is outdated. The current {{ sage }} version is {{ version }} released
+  {{ release_date }}</strong>.
   If you also want to help {{ sage }} by hosting a mirror, please <a href="./contact.html">contact us</a>.
 
   <table class="">