Merge remote-tracking branch 'upstream/ep2021' into ep2021

Author: fpierfed

Makefile

@@ -122,7 +122,7 @@ deployment-requirements:
 	chmod a+r requirements.txt
 
 install:
-	pip install -U pip==19.3.1
+	pip install -U pip
 	pip install -U pip-tools
 	pip-sync requirements.txt
 

requirements.in

@@ -21,7 +21,10 @@ social-auth-core[openidconnect]
 markdown2
 
 # 3.7 DjangoCMS LTS release
+# Please note that django-cms relies on django-treebeard and version 4.5.1 of 
+# that package is incompatible: https://stackoverflow.com/questions/66776994/
 django-cms<3.8
+django-treebeard<4.5.1
 djangocms-admin-style
 djangocms-text-ckeditor
 django-filer

requirements.txt

@@ -6,6 +6,8 @@
 #
 anglicize==0.0.3
     # via -r requirements.in
+appnope==0.1.2
+    # via ipython
 backcall==0.2.0
     # via ipython
 cairocffi==1.2.0
@@ -89,8 +91,10 @@ django-taggit==1.3.0
     # via
     #   -r requirements.in
     #   django-taggit-labels
-django-treebeard==4.5.1
-    # via django-cms
+django-treebeard==4.4
+    # via
+    #   -r requirements.in
+    #   django-cms
 django==2.2.19
     # via
     #   -r requirements.in

templates/conference/homepage/_schedule_overview.html

@@ -12,9 +12,9 @@ <h5>Monday &amp; Tuesday</h5>
                     <div class="card-body">
                         <h5 class="card-title">Trainings &amp;
                         Workshops</h5> <p class="card-text">Two days of
-                        training session and workshop.  You'll have multiple
-                        3 hour long sessions with our experts.  <br/> <br/>
-                        Our <a href="{% page_url 'tickets'%}">combined
+                        training session and workshop.  You'll have more
+                        than 10 three hour long sessions with our experts.  <br/> <br/>
+                        Our <a href="{% page_url 'tickets'%}#combined">combined
                         tickets</a> give you access to the training
                         sessions.</p>
                     </div>
@@ -29,11 +29,11 @@ <h5>Wednesday to Friday</h5>
                     </div>
                     <div class="card-body">
                         <h5 class="card-title">Conference Days</h5> <p
-                        class="card-text"> Over 110 sessions in 4 parallel
+                        class="card-text"> Over 110 sessions in several parallel
                         tracks.<br> Keynotes, talks, poster sessions, help
                         desks, recruitment sessions, lightning talks, panels
                         and more.  <br/> <br/> All included in the <a
-                        href="{% page_url 'tickets'%}">main conference
+                        href="{% page_url 'tickets'%}#conference">main conference
                         ticket</a>.</p>
                     </div>
                 </div>
@@ -49,9 +49,9 @@ <h5 class="card-title">Sprints</h5> <p
                         class="card-text">Unique opportunity to contribute
                         to your favorite Python projects and learn new
                         skills.<br/> <br/> Included in the combined and
-                        conference tickets.  You can also <a href="{%
-                        page_url 'tickets'%}">register just for the sprints
-                        for free</a>.</p>
+                        conference tickets.  You can also 
+                        <a href="{% page_url 'tickets'%}#sprint">register 
+                        just for the sprints for free</a>.</p>
                     </div>
                 </div>
             </div>

templates/conference/homepage/_sponsors.html

@@ -39,7 +39,7 @@ <h4>Silver</h4>
                 <p>Early bird sponsors will receive a 10% discount on their package price</p>
                 {% endcomment %}
 
-                <p>Are you an SME seeking greater exposure? We have special <a href="{% page_url 'sponsor-packages' %}#Small-Entity-Discounts">sponsorship discounts</a> for you!</p>
+                <p>Are you an SME seeking greater exposure? We have special <a href="{% page_url 'sponsor-packages' %}#sme">sponsorship discounts</a> for you!</p>
             </div>
         </div>