Changing text and image file names from 2020 to 2021 (#1341)

* trivial changes

* removed dataclasses as starting the port to python 3.8

* Updading Python and Django

* upgrading to django 2.2.x

* initial

* Works around coverage.py internal error

* back in sync with expected output

* added simple virtualenv dir

* upgrade to latest version or cms

* using latest version of dependencies

* working version

* updated to the latest versions

* upgraded to the latest versions

* initial

* trivial changes

removed dataclasses as starting the port to python 3.8

Remove RemovedInDjango20Warning notices (#1326)

Updading Python and Django

upgrading to django 2.2.x

initial

Works around coverage.py internal error

back in sync with expected output

added simple virtualenv dir

upgrade to latest version or cms

using latest version of dependencies

working version

updated to the latest versions

upgraded to the latest versions

initial

* Upgraded to Django 2.2.x on Python 3.9.x (fixed one test as well).

* Upgraded to Python 3.9

* attempt at installing deps

* Starting the migration from 2020 to 2021

* missed a couple fo dates: fixed them

* Turns out factoryboy changed its internal API, which is cool actually. Trouble is that we use it :-)

* Forgot about changing dates here

* moved to uniform date format

* Added a note about charging VAT and adding our VAT ID in 2022

Author: fpierfed

README.md

@@ -5,7 +5,7 @@
 
 This project (and its dependencies) contains the EuroPython website source code.
 
-The code is used for the EuroPython 2020 website.
+The code is used for the EuroPython 2021 website.
 
 # LICENSE
 
@@ -86,19 +86,19 @@ $ make test
 
 # CONTRIBUTING
 
-Note: We are using the ep2020 branch for the production version of the
-website, once we have switched on production, and dev/ep2020 during
+Note: We are using the ep2021 branch for the production version of the
+website, once we have switched on production, and dev/ep2021 during
 development leading up to the production version.  The instructions
-reference the ep2020 branch - please adjust to dev/ep2020 for the
+reference the ep2021 branch - please adjust to dev/ep2021 for the
 development version.
 
 1. Make a fork of github.com/europython/epcon
 2. Make changes in your fork (ideally on a feature/bugfix branch)
-3. Make sure your branch is based on latest `upstream/ep2020`
+3. Make sure your branch is based on latest `upstream/ep2021`
 4. Push your changes
-5. Create a pull request to `europython/epcon`, targeting `ep2020` branch.
+5. Create a pull request to `europython/epcon`, targeting `ep2021` branch.
 
-IMPORTANT: all the active development happens on the `ep2020` branch, `master` is not up to date.
+IMPORTANT: all the active development happens on the `ep2021` branch, `master` is not up to date.
 
 ## Development Guidelines
 

assets/css/ep2019-customisations.css

@@ -6,7 +6,7 @@
 .text-primary-light { color: #47A71C; }
 .text-secondary-light { color: #FFCB96; }
 
-/* Fonts for ep2020*/
+/* Fonts for ep2021*/
 @font-face {
     font-family: "Galyon";
     src: url("Galyon-Regular.otf");
@@ -41,7 +41,7 @@
 }
 
 #background_image {
-    background: url("/static/img/ep2020-background-online.jpg");
+    background: url("/static/img/ep2021-background-online.jpg");
     background-size: cover;
     color: white;
     min-height: 90px;

assets/img/ep2020-background-ccd-original.jpg assets/img/ep2021-background-ccd-original.jpg

@@ -286,7 +286,7 @@ class AddSpeakerToTalkForm(forms.ModelForm):
         label="Are you a minor?",
         help_text=(
             "Please select this checkbox if you're going to be under 18"
-            "years old on July 23rd 2020"
+            "years old on July 26th 2021"
         ),
         # required=False, because django forms... it means that unless someone
         # is a minor we don't provide a value.

assets/img/ep2020-background-ccd.jpg assets/img/ep2021-background-ccd.jpg

@@ -39,7 +39,7 @@
 
 EPS_19 = EPS_18
 
-# EP2020: Not listing the VAT ID, since we're a non-profit and VAT exempt. 
+# EP2020: Not listing the VAT ID, since we're a non-profit and VAT exempt.
 # The VAT ID would confuse people.
 EPS_20 = """
 Europython Society
@@ -51,12 +51,25 @@
 https://www.europython-society.org/
 """.strip()
 
+# EP2021: Not listing the VAT ID, since we're a non-profit and VAT exempt.
+# The VAT ID would confuse people.
 EPS_21 = """
 Europython Society
 Ramnebacken 45
 424 38 Agnesberg
 Sweden
 Org ID: 802417-7704
+Contact Email: [email protected]
+https://www.europython-society.org/
+""".strip()
+
+# EP2022: We will have to charge Irish VAT and therefore list our VAT ID.
+EPS_22 = """
+Europython Society
+Ramnebacken 45
+424 38 Agnesberg
+Sweden
+Org ID: 802417-7704
 EU VAT-ID: SE802417770401
 Contact Email: [email protected]
 https://www.europython-society.org/
@@ -67,6 +80,7 @@
     2019: EPS_19,
     2020: EPS_20,
     2021: EPS_21,
+    2022: EPS_22,
 }
 
 LOCAL_CURRENCY_BY_YEAR = {
@@ -77,20 +91,23 @@
     2019: "EUR",
     2020: "EUR",
     2021: "EUR",
+    2022: "EUR",
 }
 
 EP_CITY_FOR_YEAR = {
     2018: "Edinburgh",
     2019: "Basel",
     2020: "Online",
-    2021: "Dublin",
+    2021: "Online",
+    2022: "Dublin",
 }
 
 ADDITIONAL_TEXT_FOR_YEAR = {
     2018: "assopy/invoices/_additional_text_for_2018.html",
     2019: "assopy/invoices/_additional_text_for_2019.html",
     2020: "assopy/invoices/_additional_text_for_2020.html",
     2021: "assopy/invoices/_additional_text_for_2021.html",
+    2022: "assopy/invoices/_additional_text_for_2022.html",
 }
 
 REAL_INVOICE_PREFIX = "I/"

assets/img/ep2020-background-city.jpg assets/img/ep2021-background-city.jpg

@@ -85,10 +85,12 @@ def handle(self, *args, **options):
             add_speaker_to_talk(speaker, talk)
             profile = get_or_create_attendee_profile_for_new_user(user.user)
             if not profile.getBio():
+                # FIXME: evaluate is a private method.
+                # https://github.com/FactoryBoy/factory_boy/commit/824c6e01f91dcb07d16f51578300da3c99b6a336
                 profile.setBio(
                     factory.Faker(
                         "sentence", nb_words=20, variable_nb_words=True
-                    ).generate({})
+                    ).evaluate(None, None, extra={"locale": None})
                 )
 
         for i in range(20):
@@ -196,7 +198,7 @@ def new_page(rev_id, title, **kwargs):
             ("social-media", "Social Media"),
             ("code-of-conduct", "Code of Conduct"),
             ("privacy", "Privacy policy"),
-            ("workgroups", "2020 Team"),
+            ("workgroups", "2021 Team"),
             ("photos", "Photos"),
             ("videos", "Videos"),
             ("terms", "Terms & Conditions"),

assets/img/ep2020-background-online.jpg assets/img/ep2021-background-online.jpg

@@ -29,7 +29,7 @@ def latest_order_code_for_year(year):
     returns latest used order.code in a given year.
     rtype – string or None
     """
-    assert 2016 <= year <= 2020, year
+    assert 2016 <= year <= 2021, year
 
     orders = Order.objects.filter(
         code__startswith=ORDER_CODE_PREFIX, created__year=year
@@ -39,7 +39,7 @@ def latest_order_code_for_year(year):
 
 
 def next_order_code_for_year(year):
-    assert 2016 <= year <= 2020, year
+    assert 2016 <= year <= 2021, year
 
     current_code = latest_order_code_for_year(year)
     if current_code:

assets/img/ep2020-conference-venue-from-above.jpg assets/img/ep2021-conference-venue-from-above.jpg

@@ -42,7 +42,7 @@
 _debug = 1
 
 # URL prefix to use in URLs
-URL_PREFIX = settings.DEFAULT_URL_PREFIX or 'https://ep2020.europython.eu'
+URL_PREFIX = settings.DEFAULT_URL_PREFIX or 'https://ep2021.europython.eu'
 
 ### Helpers
 

assets/img/ep2020-favicon.png assets/img/ep2021-favicon.png

@@ -21,7 +21,7 @@
     on port 8000. Pointing a browser at http://localhost:8000/ will
     then load the app into the browser.
 
-    Author: Marc-Andre Lemburg, 2016-2020.
+    Author: Marc-Andre Lemburg, 2016-2021.
 
 """
 import sys

assets/img/ep2020-icon-logo-small.png assets/img/ep2021-icon-logo-small.png

@@ -44,7 +44,7 @@
 #
 # 
 #
-if settings.CONFERENCE_CONFERENCE == 'ep2020':
+if settings.CONFERENCE_CONFERENCE == 'ep2021':
     # For the virtul event we give out 100% coupons
     TALK_TYPE_DISCOUNTS = {
         't': ('TLK', '100%', False),  # Talk

assets/img/ep2020-icon-logo.png assets/img/ep2021-icon-logo.png

@@ -37,7 +37,7 @@
 LICENSE = """
 
 License: This video is licensed under the CC BY-NC-SA 3.0 license: https://creativecommons.org/licenses/by-nc-sa/3.0/
-Please see our speaker release agreement for details: https://ep2020.europython.eu/events/speaker-release-agreement/
+Please see our speaker release agreement for details: https://ep2021.europython.eu/events/speaker-release-agreement/
 """
 
 # Special handling of poster sessions
@@ -127,7 +127,7 @@ def video_description(title, abstract,
     # XXX Make this configurables in settings
     return """\
 %(title)s
-[EuroPython 2020 - %(type)s - %(date)s - %(room)s]
+[EuroPython 2021 - %(type)s - %(date)s - %(room)s]
 [Online]
 
 %(abstract)s

assets/img/ep2020-logo-white-1024px-alpha.png assets/img/ep2021-logo-white-1024px-alpha.png

@@ -16,12 +16,12 @@ def render_meta(context, title=""):
 
     description = ""
     page_title = (
-        f"{title}EuroPython 2020 Online · 23-26 July 2020"
+        f"{title}EuroPython 2021 Online · July 26 - Aug. 1, 2021"
     )
     page_url = context["CURRENT_URL"]
 
     image_url = context.get("social_image_url") or request.build_absolute_uri(
-        static("img/ep2020-social-online-card.jpg")
+        static("img/ep2021-social-online-card.jpg")
     )
 
     TEMPLATE = f"""

assets/img/ep2020-logo.png assets/img/ep2021-logo.png

@@ -452,18 +452,18 @@ def _(x):
 SESSION_COOKIE_NAME = 'sid'
 SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
 
-CONFERENCE_CONFERENCE = 'ep2020'
-CONFERENCE_NAME = "EuroPython 2020"
+CONFERENCE_CONFERENCE = 'ep2021'
+CONFERENCE_NAME = "EuroPython 2021"
 CONFERENCE_SEND_EMAIL_TO = ["[email protected]"]
 CONFERENCE_TALK_SUBMISSION_NOTIFICATION_EMAIL = []
-CONFERENCE_VOTING_DISALLOWED = 'https://ep2020.europython.eu/talk-voting/'
+CONFERENCE_VOTING_DISALLOWED = 'https://ep2021.europython.eu/talk-voting/'
 CONFERENCE_TALK_VOTING_ELIGIBLE = (
     "ep2015",
     "ep2016",
     "ep2017",
     "ep2018",
     "ep2019",
-    "ep2020",
+    "ep2021",
 )
 EARLY_BIRD_ORDER_LIMIT = config("EARLY_BIRD_ORDER_LIMIT", default=220, cast=int)
 
@@ -669,7 +669,7 @@ def CONFERENCE_SCHEDULE_ATTENDEES(schedule, forecast):
 # It is used for generating URLs pointing back to the site
 # in quite a few places.
 #
-DEFAULT_URL_PREFIX = 'https://ep2020.europython.eu'
+DEFAULT_URL_PREFIX = 'https://ep2021.europython.eu'
 LOGIN_REDIRECT_URL = reverse_lazy("user_panel:dashboard")
 
 P3_TWITTER_USER = 'europython'
@@ -678,7 +678,7 @@ def CONFERENCE_SCHEDULE_ATTENDEES(schedule, forecast):
 This message was sent from a participant at the EuroPython conference.
 Your email address is not disclosed to anyone, to stop receiving messages
 from other users you can change your privacy settings from this page:
-https://ep2020.europython.eu/accounts/profile/
+https://ep2021.europython.eu/accounts/profile/
 '''
 
 

assets/img/ep2020-online-logo.png assets/img/ep2021-online-logo.png

@@ -6,8 +6,7 @@ pytest-xdist
 
 freezegun
 responses
-# factory_boy
-git+https://github.com/FactoryBoy/factory_boy.git#factory_boy
+factory_boy
 
 flake8
 black