Merge branch 'main' into release

ewdurbin · ewdurbin · commit bd837b603615 · 2024-01-17T14:18:49.000-05:00
diff --git a/downloads/api.py b/downloads/api.py
@@ -69,7 +69,7 @@ class Meta(GenericResource.Meta):
             'creator', 'last_modified_by',
             'os', 'release', 'description', 'is_source', 'url', 'gpg_signature_file',
             'md5_sum', 'filesize', 'download_button', 'sigstore_signature_file',
-            'sigstore_cert_file', 'sigstore_bundle_file',
+            'sigstore_cert_file', 'sigstore_bundle_file', 'sbom_spdx2_file',
         ]
         filtering = {
             'name': ('exact',),
diff --git a/downloads/migrations/0010_releasefile_sbom_spdx2_file.py b/downloads/migrations/0010_releasefile_sbom_spdx2_file.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.24 on 2024-01-12 21:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('downloads', '0009_releasefile_sigstore_bundle_file'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='releasefile',
+            name='sbom_spdx2_file',
+            field=models.URLField(blank=True, help_text='SPDX-2 SBOM URL', verbose_name='SPDX-2 SBOM URL'),
+        ),
+    ]
diff --git a/downloads/models.py b/downloads/models.py
@@ -332,6 +332,9 @@ class ReleaseFile(ContentManageable, NameSlugModel):
     sigstore_bundle_file = models.URLField(
         "Sigstore Bundle URL", blank=True, help_text="Sigstore Bundle URL"
     )
+    sbom_spdx2_file = models.URLField(
+        "SPDX-2 SBOM URL", blank=True, help_text="SPDX-2 SBOM URL"
+    )
     md5_sum = models.CharField('MD5 Sum', max_length=200, blank=True)
     filesize = models.IntegerField(default=0)
     download_button = models.BooleanField(default=False, help_text="Use for the supernav download button for this OS")
diff --git a/downloads/serializers.py b/downloads/serializers.py
@@ -49,4 +49,5 @@ class Meta:
             'sigstore_signature_file',
             'sigstore_cert_file',
             'sigstore_bundle_file',
+            'sbom_spdx2_file',
         )
diff --git a/downloads/templatetags/download_tags.py b/downloads/templatetags/download_tags.py
@@ -14,3 +14,8 @@ def has_sigstore_materials(files):
         f.sigstore_bundle_file or f.sigstore_cert_file or f.sigstore_signature_file
         for f in files
     )
+
+
+@register.filter
+def has_sbom(files):
+    return any(f.sbom_spdx2_file for f in files)
diff --git a/sponsors/admin.py b/sponsors/admin.py
@@ -246,9 +246,13 @@ def has_delete_permission(self, request, obj=None):
             return True
         return obj.open_for_editing
 
-    def get_queryset(self, *args, **kwargs):
-        qs = super().get_queryset(*args, **kwargs)
-        return qs.select_related("sponsorship_benefit__program", "program")
+    def get_queryset(self, request):
+        #filters the available benefits by the benefits for the year of the sponsorship
+        match = request.resolver_match
+        sponsorship = self.parent_model.objects.get(pk=match.kwargs["object_id"])
+        year = sponsorship.year
+
+        return super().get_queryset(request).filter(sponsorship_benefit__year=year)
 
 
 class TargetableEmailBenefitsFilter(admin.SimpleListFilter):
diff --git a/sponsors/forms.py b/sponsors/forms.py
@@ -253,10 +253,17 @@ class SponsorshipApplicationForm(forms.Form):
     state = forms.CharField(
         label="State/Province/Region", max_length=64, required=False
     )
+    state_of_incorporation = forms.CharField(
+        label="State of incorporation", help_text="US only, If different than mailing address", max_length=64, required=False
+    )
     postal_code = forms.CharField(
         label="Zip/Postal Code", max_length=64, required=False
     )
-    country = CountryField().formfield(required=False)
+    country = CountryField().formfield(required=False, help_text="For mailing/contact purposes")
+
+    country_of_incorporation = CountryField().formfield(
+        label="Country of incorporation", help_text="For contractual purposes", required=False
+    )
 
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop("user", None)
@@ -373,6 +380,8 @@ def save(self):
             landing_page_url=self.cleaned_data.get("landing_page_url", ""),
             twitter_handle=self.cleaned_data["twitter_handle"],
             print_logo=self.cleaned_data.get("print_logo"),
+            country_of_incorporation=self.cleaned_data.get("country_of_incorporation", ""),
+            state_of_incorporation=self.cleaned_data.get("state_of_incorporation", ""),
         )
         contacts = [f.save(commit=False) for f in self.contacts_formset.forms]
         for contact in contacts:
diff --git a/sponsors/migrations/0100_auto_20240107_1054.py b/sponsors/migrations/0100_auto_20240107_1054.py
@@ -0,0 +1,29 @@
+# Generated by Django 2.2.24 on 2024-01-07 10:54
+
+from django.db import migrations, models
+import django_countries.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sponsors', '0099_auto_20231224_1854'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sponsor',
+            name='country_of_incorporation',
+            field=django_countries.fields.CountryField(blank=True, help_text='For contractual purposes', max_length=2, null=True, verbose_name='Country of incorporation (If different)'),
+        ),
+        migrations.AddField(
+            model_name='sponsor',
+            name='state_of_incorporation',
+            field=models.CharField(blank=True, default='', max_length=64, null=True, verbose_name='US only: State of incorporation (If different)'),
+        ),
+        migrations.AlterField(
+            model_name='sponsor',
+            name='country',
+            field=django_countries.fields.CountryField(default='', help_text='For mailing/contact purposes', max_length=2),
+        ),
+    ]
diff --git a/sponsors/models/sponsors.py b/sponsors/models/sponsors.py
@@ -73,8 +73,15 @@ class Sponsor(ContentManageable):
     postal_code = models.CharField(
         verbose_name="Zip/Postal Code", max_length=64, default=""
     )
-    country = CountryField(default="")
+    country = CountryField(default="", help_text="For mailing/contact purposes")
     assets = GenericRelation(GenericAsset)
+    country_of_incorporation = CountryField(
+        verbose_name="Country of incorporation (If different)", help_text="For contractual purposes", blank=True, null=True
+    )
+    state_of_incorporation = models.CharField(
+        verbose_name="US only: State of incorporation (If different)",
+        max_length=64, blank=True, null=True, default=""
+    )
 
     class Meta:
         verbose_name = "sponsor"
diff --git a/sponsors/tests/test_forms.py b/sponsors/tests/test_forms.py
@@ -423,14 +423,18 @@ def test_create_sponsor_with_valid_data(self):
     def test_create_sponsor_with_valid_data_for_non_required_inputs(
             self,
     ):
+        user = baker.make(settings.AUTH_USER_MODEL)
+
         self.data["description"] = "Important company"
         self.data["landing_page_url"] = "https://companyx.com"
         self.data["twitter_handle"] = "@companyx"
+        self.data["country_of_incorporation"] = "US"
+        self.data["state_of_incorporation"] = "NY"
         self.files["print_logo"] = get_static_image_file_as_upload(
             "psf-logo_print.png", "logo_print.png"
         )
 
-        form = SponsorshipApplicationForm(self.data, self.files)
+        form = SponsorshipApplicationForm(self.data, self.files, user=user)
         self.assertTrue(form.is_valid(), form.errors)
 
         sponsor = form.save()
@@ -440,6 +444,8 @@ def test_create_sponsor_with_valid_data_for_non_required_inputs(
         self.assertFalse(form.user_with_previous_sponsors)
         self.assertEqual(sponsor.landing_page_url, "https://companyx.com")
         self.assertEqual(sponsor.twitter_handle, "@companyx")
+        self.assertEqual(sponsor.country_of_incorporation, "US")
+        self.assertEqual(sponsor.state_of_incorporation, "NY")
 
     def test_create_sponsor_with_svg_for_print_logo(
             self,
diff --git a/templates/downloads/release_detail.html b/templates/downloads/release_detail.html
@@ -2,6 +2,7 @@
 {% load boxes %}
 {% load sitetree %}
 {% load has_sigstore_materials from download_tags %}
+{% load has_sbom from download_tags %}
 
 {% block body_attributes %}class="python downloads"{% endblock %}
 
@@ -53,6 +54,9 @@ <h1 class="page-title">Files</h1>
               {% if release_files|has_sigstore_materials %}
               <th colspan="2"><a href="https://www.python.org/download/sigstore/">Sigstore</a></th>
               {% endif %}
+              {% if release_files|has_sbom %}
+              <th>SBOM</th>
+              {% endif %}
             </tr>
           </thead>
           <tbody>
@@ -72,6 +76,9 @@ <h1 class="page-title">Files</h1>
                   <td>{% if f.sigstore_signature_file %}<a href="{{ f.sigstore_signature_file }}">SIG</a>{% endif %}</td>
                   {% endif %}
                 {% endif %}
+                {% if release_files|has_sbom %}
+                  <td>{% if f.sbom_spdx2_file %}<a href="{{ f.sbom_spdx2_file }}">SPDX</a>{% endif %}</td>
+                {% endif %}
               </tr>
             {% endfor %}
           </tbody>
diff --git a/templates/sponsors/new_sponsorship_application_form.html b/templates/sponsors/new_sponsorship_application_form.html
@@ -2,15 +2,19 @@
 {% load boxes widget_tweaks %}
 {% load humanize %}
 {% load sponsors %}
+{% block page_title %}Sponsorship Information{% endblock %}
 
 
-{% block page_title %}Submit Sponsorship Information{% endblock %}
 
 {% block content %}
   <article id="new_sponsorship_application_container" class="text">
-    <h1>Submit Sponsorship Information</h1>
 
-    <div id="sponsorship-info-container" class="user-feedback level-general">
+{% if sponsor %}
+<div>
+<h1> Edit {{sponsor}}</h1>
+</div>
+{% else %}
+        <div id="sponsorship-info-container" class="user-feedback level-general">
       {% if sponsorship_package %}
       <p>
         You selected the <b>{{ sponsorship_package.name }}</b> package {% if sponsorship_price %}costing ${{ sponsorship_price|intcomma }} USD {% endif %}and the following benefits:
@@ -34,6 +38,10 @@ <h1>Submit Sponsorship Information</h1>
       <span class="remove"><label id="close-info-container">Close</label> | <a href="{% url 'select_sponsorship_application_benefits' %}">Back to select benefits</a></span>
     </div>
 
+    <h1>Submit Sponsorship Information</h1>
+{% endif %}
+
+
     {% if form.errors %}
     <span class="error-message">The form has one or more errors</span>
     {{ form.non_field_errors }}
@@ -53,6 +61,8 @@ <h1>Submit Sponsorship Information</h1>
 
       <div id="new-appication-fields" {% if form.user_with_previous_sponsors and not form.errors %}style="display: none"{% endif %}>
 
+        <h2>Basics</h2>
+
         <p class="form_field">
           <label>{{ form.name.label }} <span class="error-message">{% if form.name.errors %}{{ form.name.errors.as_text }}</span>{% endif %}</label>
           {% render_field form.name %}
@@ -62,6 +72,33 @@ <h1>Submit Sponsorship Information</h1>
           {% endif %}
         </p>
 
+
+        <div class="inline_fields">
+          <div>
+            <p class="form_field">
+            <label>{{ form.country_of_incorporation.label }} <span class="error-message">{% if form.country_of_incorporation.errors %}
+              {{ form.country.errors.as_text }}</span>{% endif %}</label>
+            {% render_field form.country_of_incorporation %}
+            {% if form.country_of_incorporation.help_text %}
+              <br/>
+              <span class="helptext">{{ form.country_of_incorporation.help_text }}</span>
+            {% endif %}
+            </p>
+          </div>
+
+          <div>
+            <p class="form_field">
+            <label>{{ form.state_of_incorporation.label }} <span class="error-message">{% if form.state_of_incorporation.errors %}
+              {{ form.state_of_incorporation.errors.as_text }}</span>{% endif %}</label>
+            {% render_field form.state %}
+            {% if form.state_of_incorporation.help_text %}
+              <br/>
+              <span class="helptext">{{ form.state_of_incorporation.help_text }}</span>
+            {% endif %}
+            </p>
+          </div>
+        </div>
+
         <p class="form_field">
           <label>{{ form.description.label }} <span class="error-message">{% if form.description.errors %}{{ form.description.errors.as_text }}</span>{% endif %}</label>
           {% render_field form.description %}
@@ -95,14 +132,39 @@ <h1>Submit Sponsorship Information</h1>
           </div>
         </div>
 
-        <p class="form_field">
-          <label>{{ form.country.label }} <span class="error-message">{% if form.country.errors %}{{ form.country.errors.as_text }}</span>{% endif %}</label>
-          {% render_field form.country %}
-          {% if form.country.help_text %}
-          <br/>
-          <span class="helptext">{{ form.country.help_text }}</span>
-          {% endif %}
-        </p>
+        <div class="inline_fields">
+          <div>
+          <p class="form_field">
+          <label>{{ form.web_logo.label }} <span class="error-message">{% if form.web_logo.errors %}{{ form.web_logo.errors.as_text }}</span>{% endif %}</label>
+            {% render_field form.web_logo %}
+            {% if sponsor.web_logo %}
+          <p>Currently: <a href="{{ sponsor.web_logo.url }}">{{ sponsor.web_logo.name }}</a></p>
+        {% endif %}
+            {% if form.web_logo.help_text %}
+            <br/>
+            <span class="helptext">{{ form.web_logo.help_text }}</span>
+            {% endif %}
+          </p>
+          </div>
+
+          <div>
+          <p class="form_field">
+            <label>{{ form.print_logo.label }} <span class="error-message">{% if form.print_logo.errors %}{{ form.print_logo.errors.as_text }}</span>{% endif %}</label>
+            {% render_field form.print_logo %}
+            {% if sponsor.print_logo %}
+          <p>Currently: <a href="{{ sponsor.print_logo.url }}">{{ sponsor.print_logo.name }}</a></p>
+        {% endif %}
+            {% if form.print_logo.help_text %}
+            <br/>
+            <span class="helptext">{{ form.print_logo.help_text }}</span>
+            {% endif %}
+          </p>
+          </div>
+        </div>
+
+        <hr>
+
+        <h2>Mailing and Contact</h2>
 
         <div class="inline_fields">
           <div>
@@ -167,37 +229,26 @@ <h1>Submit Sponsorship Information</h1>
 
           <div>
             <p class="form_field">
-              <label>{{ form.primary_phone.label }} <span class="error-message">{% if form.primary_phone.errors %}{{ form.primary_phone.errors.as_text }}</span>{% endif %}</label>
-              {% render_field form.primary_phone %}
-              {% if form.primary_phone.help_text %}
+              <label>{{ form.country.label }} <span class="error-message">{% if form.country.errors %}{{ form.country.errors.as_text }}</span>{% endif %}</label>
+              {% render_field form.country %}
+              {% if form.country.help_text %}
               <br/>
-              <span class="helptext">{{ form.primary_phone.help_text }}</span>
+              <span class="helptext">{{ form.country.help_text }}</span>
               {% endif %}
             </p>
           </div>
         </div>
 
         <div class="inline_fields">
           <div>
-          <p class="form_field">
-          <label>{{ form.web_logo.label }} <span class="error-message">{% if form.web_logo.errors %}{{ form.web_logo.errors.as_text }}</span>{% endif %}</label>
-            {% render_field form.web_logo %}
-            {% if form.web_logo.help_text %}
-            <br/>
-            <span class="helptext">{{ form.web_logo.help_text }}</span>
-            {% endif %}
-          </p>
-          </div>
-
-          <div>
-          <p class="form_field">
-            <label>{{ form.print_logo.label }} <span class="error-message">{% if form.print_logo.errors %}{{ form.print_logo.errors.as_text }}</span>{% endif %}</label>
-            {% render_field form.print_logo %}
-            {% if form.print_logo.help_text %}
-            <br/>
-            <span class="helptext">{{ form.print_logo.help_text }}</span>
-            {% endif %}
-          </p>
+            <p class="form_field">
+              <label>{{ form.primary_phone.label }} <span class="error-message">{% if form.primary_phone.errors %}{{ form.primary_phone.errors.as_text }}</span>{% endif %}</label>
+              {% render_field form.primary_phone %}
+              {% if form.primary_phone.help_text %}
+              <br/>
+              <span class="helptext">{{ form.primary_phone.help_text }}</span>
+              {% endif %}
+            </p>
           </div>
         </div>
 
@@ -216,11 +267,16 @@ <h1>Contacts</h1>
 
           <button class="formset-btn add-form-row" type="button">Extra contact</button>
         </div>
-
+{% if sponsor %}
+              <div class="form-actions">
+        <input type="submit" name="submit-btn" value="Save"/>
+      </div>
+        {% else %}
       </div>
 
       <input id="submit-btn" type="submit" value="Apply">
     </form>
+    {% endif %}
   </article>
 
 {% endblock content %}
diff --git a/templates/users/sponsor_info_update.html b/templates/users/sponsor_info_update.html
diff --git a/users/tests/test_views.py b/users/tests/test_views.py
diff --git a/users/views.py b/users/views.py

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class Meta(GenericResource.Meta):`
`69`	`69`	`'creator', 'last_modified_by',`
`70`	`70`	`'os', 'release', 'description', 'is_source', 'url', 'gpg_signature_file',`
`71`	`71`	`'md5_sum', 'filesize', 'download_button', 'sigstore_signature_file',`
`72`		`- 'sigstore_cert_file', 'sigstore_bundle_file',`
	`72`	`+ 'sigstore_cert_file', 'sigstore_bundle_file', 'sbom_spdx2_file',`
`73`	`73`	`]`
`74`	`74`	`filtering = {`
`75`	`75`	`'name': ('exact',),`
Original file line number	Diff line number	Diff line change
`@@ -49,4 +49,5 @@ class Meta:`
`49`	`49`	`'sigstore_signature_file',`
`50`	`50`	`'sigstore_cert_file',`
`51`	`51`	`'sigstore_bundle_file',`
	`52`	`+ 'sbom_spdx2_file',`
`52`	`53`	`)`
Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,8 @@ def has_sigstore_materials(files):`
`14`	`14`	`f.sigstore_bundle_file or f.sigstore_cert_file or f.sigstore_signature_file`
`15`	`15`	`for f in files`
`16`	`16`	`)`
	`17`	`+`
	`18`	`+`
	`19`	`+@register.filter`
	`20`	`+def has_sbom(files):`
	`21`	`+ return any(f.sbom_spdx2_file for f in files)`