Skip to content

Commit 1ec7ac2

Browse files
warthog9warthog9
authored
Merge branch 'main' into add-open-world-holidays-framework
2 parents 0fffb8e + 1ea4137 commit 1ec7ac2

File tree

2 files changed

+65
-20
lines changed

2 files changed

+65
-20
lines changed

‎ideas.html‎

Lines changed: 60 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@
5050
<a href="index.html#contact" class="pure-menu-link">Contact</a>
5151
</li>
5252
</ul>
53-
</div>
54-
</div>
55-
<!-- menu -->
53+
</div><!-- !pure-menu -->
54+
</div><!-- !menu -->
5655

5756
<!-- How to apply -->
5857
<a id="ideas"></a>
@@ -68,7 +67,7 @@ <h2>Mentoring orgs for GSoC 2026 have not been announced!</h2>
6867
<p>Mentors: If you're a sub-org who wants to join, please
6968
<a href="https://python-gsoc.org/mentors.html#sub-orgs">read the information for sub-orgs</a>.
7069
</p>
71-
</div>
70+
</div><!-- !pure-u-1 -->
7271
</div><!-- !warning -->
7372
<br />
7473
</div><!-- !Ideas -->
@@ -80,34 +79,38 @@ <h2>Mentoring orgs for GSoC 2026 have not been announced!</h2>
8079
<div class="pure-u-1 pure-u-md-1-1 pure-u-lg-1-1 shuffleMe">
8180
<div class="pure-g">
8281
<div class="pure-u-1 pure-u-md-1-2 logo">
83-
<img src="/logos/borg_256.png" />
82+
<img src="/logos/logo-pocketpy.png"/>
8483
</div>
8584
<div class="pure-u-1 pure-u-md-1-2">
8685
<h2>
87-
Borg Collective
86+
pocketpy
8887
</h2>
8988
</div>
9089
</div>
9190
<br />
92-
We are the Borg Collective and maintain multiple Python-based backup tools that are often used in combination: Borg, Borgmatic and Vorta. The core Borg tool is a deduplicating archiver with compression and deduplication. Vorta is a desktop backp client that integrtes with Linux and macOS desktops. Borgmatic is a wrapper for server systems that also takes care of database backups and pre-backup commands.
91+
pocketpy is an organization dedicated to creating game development tools.
92+
It maintains a portable Python 3.x implementation,
93+
which has no dependencies other than the C11 standard library,
94+
making it easy to to embed Python scripting into existing C/C++ projects.
95+
pocketpy also provides plugins for popular game engines like Godot and raylib.
9396
<div class="pure-g">
9497
<div class="pure-u-1 pure-u-md-1">
9598
<p>Contact Links</p>
9699
</div>
97100
<div class="pure-u-1 pure-u-md-1-3" style="text-align: center;">
98-
<p><a href="https://matrix.to/#/#vorta:matrix.org">Chat</a></p>
101+
<p><a href="https://discord.gg/WWaq72GzXv">Chat</a></p>
99102
</div>
100103
<div class="pure-u-1 pure-u-md-1-3" style="text-align: center;">
101-
<p><a href="https://www.reddit.com/r/BorgBackup/">Mailing List</a></p>
104+
<p><a href="https://pocketpy.dev/">Homepage</a></p>
102105
</div>
103106
<div class="pure-u-1 pure-u-md-1-3" style="text-align: center;">
104-
<p><a href="https://vorta.borgbase.com/">Homepage</a></p>
107+
<p><a href="mailto:blueloveth@foxmail.com">blueloveth@foxmail.com</a></p>
105108
</div>
106109
<div class="pure-u-1 pure-u-md-1" style="text-align: center;">
107-
<p><a href="https://github.com/borgbase/vorta/wiki/Google-Summer-of-Code-2025-Ideas" alt="Borg Collective logo">Ideas Page</a></p>
110+
<p><a href="https://pocketpy.dev/gsoc2026/ideas/" alt="pocketpy logo">Ideas Page</a></p>
108111
</div>
109112
<div class="pure-u-1 pure-u-md-1" style="text-align: center;">
110-
<p><a href="https://github.com/borgbase/vorta/" alt="Borg Collective">Source Code</a></p>
113+
<p><a href="https://github.com/pocketpy/pocketpy" alt="pocketpy source">Source Code</a></p>
111114
</div>
112115
</div>
113116
<hr>
@@ -116,7 +119,40 @@ <h2>
116119
<div class="pure-u-1 pure-u-md-1-1 pure-u-lg-1-1 shuffleMe">
117120
<div class="pure-g">
118121
<div class="pure-u-1 pure-u-md-1-2 logo">
119-
<img src="/logos/holidays_logo.png" />
122+
<img src="/logos/borg_256.png" />
123+
</div><!-- !pure-u-1 -->
124+
<div class="pure-u-1 pure-u-md-1-2">
125+
<h2>
126+
Borg Collective
127+
</h2>
128+
</div><!-- !pure-u-1 -->
129+
</div><!-- !pure-g -->
130+
<br />
131+
We are the Borg Collective and maintain multiple Python-based backup tools that are often used in combination: Borg, Borgmatic and Vorta. The core Borg tool is a deduplicating archiver with compression and encryption. Vorta is a desktop backup client that integrates with Linux and macOS desktops. Borgmatic is a wrapper for server systems that also takes care of database backups and pre-backup commands.
132+
<div class="pure-g">
133+
<div class="pure-u-1 pure-u-md-1">
134+
<p>Contact Links</p>
135+
</div>
136+
<div class="pure-u-1 pure-u-md-1-3" style="text-align: center;">
137+
<p><a href="https://www.reddit.com/r/BorgBackup/">Reddit</a></p>
138+
</div>
139+
<div class="pure-u-1 pure-u-md-1-3" style="text-align: center;">
140+
<p><a href="https://vorta.borgbase.com/">Homepage</a></p>
141+
</div>
142+
<div class="pure-u-1 pure-u-md-1" style="text-align: center;">
143+
<p><a href="https://github.com/borgbase/vorta/wiki/Google-Summer-of-Code-2026-Ideas" alt="Borg Collective logo">Ideas Page</a></p>
144+
</div>
145+
<div class="pure-u-1 pure-u-md-1" style="text-align: center;">
146+
<p><a href="https://github.com/borgbase/vorta/" alt="Borg Collective">Source Code</a></p>
147+
</div>
148+
</div><!-- !pure-g -->
149+
<hr>
150+
</div><!-- !pure-u-1 -->
151+
<!--- break --->
152+
<div class="pure-u-1 pure-u-md-1-1 pure-u-lg-1-1 shuffleMe">
153+
<div class="pure-g">
154+
<div class="pure-u-1 pure-u-md-1-2 logo">
155+
<img src="/logos/DIPY.png" />
120156
</div>
121157
<div class="pure-u-1 pure-u-md-1-2">
122158
<h2>
@@ -150,7 +186,13 @@ <h2>
150186
</div>
151187
<hr>
152188
</div>
153-
</div>
189+
<!--- break --->
190+
</div><!-- !container -->
191+
192+
<!-- Past here finishes out the list -->
193+
194+
<div id="container">
195+
<!--- break --->
154196
<div class="content">
155197
<div class="pure-u-1 pure-u-md-1-1 pure-u-lg-1-1">
156198
<h2 class="content-head content-head">Not participating in GSoC2026</h2>
@@ -162,10 +204,13 @@ <h2 class="content-head content-head">Not participating in GSoC2026</h2>
162204
<li>
163205
<a href="https://github.com/ossf/cve-bin-tool/">CVE Binary Tool</a>
164206
</li>
207+
<li>
208+
<a href="https://github.com/pyladies/pyladiescon-portal/">PyLadiesCon</a>
209+
</li>
165210
</ul>
166211
</div>
167212
</div><!-- !content -->
168-
<div class="content">
213+
<div class="content">
169214
<div class="pure-u-1 pure-u-md-1-1 pure-u-lg-1-1">
170215
<h2 class="content-head content-head">Friends of the PSF</h2>
171216
<p>Here's some more interesting organizations that use Python!</p>

‎index.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ <h3 class="content-subhead content-head-ribbon">
9595
<div class="warning">
9696
<div class="pure-u-1 pure-u-md-1-1 pure-u-lg-1-1">
9797
<p>GSoC 2026 has been announced!</p>
98-
<p><h2>Python is hoping to apply to GSoC 2026, but right now we don't know anything! We will not have a list of sub-orgs until late January 2026 and there is no guarantee we will be accepted as a mentoring org.</h2></p>
98+
<p><h2>Python is hoping to apply to GSoC 2026, but right now we don't know anything! Our list of 2026 participating sub-orgs can be found on the <a href="ideas.html">ideas </a></h2></p>
9999
<p>
100100
Contributors: Please start with the <a href="https://python-gsoc.org/#gettingstarted">Python GSoC getting started guide</a>.
101101
Our list of 2026 participating sub orgs can be found <a href="ideas.html">on the ideas page</a>. Please talk to the organizations directly.
@@ -230,7 +230,7 @@ <h3 class="content-subhead">
230230
<h2 class="content-head content-head-ribbon">How to apply</h2>
231231
<p>Short application checklist:</p>
232232
<ol>
233-
<li><strong>Read the links and instructions</strong> given on this site -- All of it! we've
233+
<li><strong>Read the links and instructions</strong> given on this site -- All of it! We've
234234
tried
235235
to give you all
236236
the information you need to be an awesome GSoC applicant.
@@ -340,8 +340,8 @@ <h3 class="content-subhead content-head-ribbon">
340340
<li><strong>A random ebook or other file on your hard drive.</strong> Not only is this not a valid GSoC application, it's often copyright infringement.</li>
341341
<li><strong>Submitted your grand idea for improving Python the language.</strong> You can read more about how to propose enhancements to python in <a href="https://peps.python.org/pep-0001/">PEP-1</a>, but GSoC is not the place for that.</li>
342342
<li><strong>Project ideas not associated with a sub-org.</strong> Often these are related to current popular topics. For example, in 2020 we got a lot of covid-tracking application proposals. If you want to work on generative AI, LLMs, crypto, machine learning, big data, etc please apply to a do a project suggested by a mentor or work directly with a sub-org to make sure your project idea is something they actually want. Most "hot topic" ideas we get are very poorly researched, infeasible, or otherwise not viable GSoC projects.</strong>
343-
<li><strong>Really simple python application ideas that are not 175 or 350 hours worth of work</strong> (For example, a python "hello world" script. Seriously. We get several of these most years.)</li>
344-
<li><strong>Random python code converted to a pdf.</strong></li>
343+
<li><strong>Really Simple Python application ideas that are not 175 or 350 hours worth of work</strong> (For example, a Python "hello world" script. Seriously. We get several of these most years.)</li>
344+
<li><strong>Random Python code converted to a pdf.</strong></li>
345345
<li><strong>A small business or personal open source project idea.</strong> GSoC is not a startup incubator, sorry. You need to apply to work with an open source project that already exists and has mentors available.</li>
346346
</ul>
347347
</div>
@@ -442,7 +442,7 @@ <h3 class="content-subhead content-head-ribbon">
442442
<i class="fa fa-crown"></i>
443443
Org admins
444444
</h3>
445-
<p>The 2025 Python Software Foundation (PSF) org admin team:</p>
445+
<p>The 2026 Python Software Foundation (PSF) org admin team:</p>
446446
<ul>
447447
<li>Terri Oda (@terri:python-gsoc.org on Matrix) - focus areas: figurehead, making final decisions,
448448
website/documentation

0 commit comments

Comments
 (0)