Skip to content

Commit 1b2c28c

Browse files
marcoagmarcoag
committed
Squashed commit of the following:
commit 2c363aa Author: Tobias Kunze <r@rixx.de> Date: Fri Feb 16 15:17:08 2024 +0100 Bump to development version commit 6dc9c1b Author: Tobias Kunze <r@rixx.de> Date: Fri Feb 16 15:10:51 2024 +0100 Release v2024.1.0 commit 54510bf Author: Tobias Kunze <r@rixx.de> Date: Fri Feb 16 13:34:27 2024 +0100 Fix missing ellipsis in global search commit 79f053c Author: Tobias Kunze <r@rixx.de> Date: Fri Feb 16 12:40:35 2024 +0100 Update release docs commit 6d3107a Author: Tobias Kunze <r@rixx.de> Date: Fri Feb 16 12:19:44 2024 +0100 Remove antiquated stackexchange link commit aa3b6e4 Author: Tobias Kunze <r@rixx.de> Date: Fri Feb 16 12:12:41 2024 +0100 Update redirecting/broken URLs commit 3dedb24 Author: Tobias Kunze <r@rixx.de> Date: Fri Feb 16 12:08:16 2024 +0100 Remove old TODO items commit e33919c Author: Tobias Kunze <r@rixx.de> Date: Fri Feb 16 12:03:24 2024 +0100 Remove Python 3.7 compatibility commit bee2859 Author: Tobias Kunze <r@rixx.de> Date: Fri Feb 16 12:00:12 2024 +0100 Update translation percentages commit 59fdb65 Author: Tobias Kunze <r@rixx.de> Date: Fri Feb 16 12:00:01 2024 +0100 Add Dutch and Italian translations commit 5e17560 Author: pretalx-translations <translate@pretalx.com> Date: Fri Feb 16 11:50:44 2024 +0100 Translations update: German and Dutch Co-authored-by: Florian Mösch <florian@moesch.org> Co-authored-by: Tobias Kunze <r@rixx.de> Co-authored-by: Stefano Campus <skampus@gmail.com> Co-authored-by: Carole_Grootenboer <carole.grootenboer@surf.nl> Signed-off-by: Marco A. Gutierrez <marcogg@marcogg.com>
1 parent 9f7752e commit 1b2c28c

File tree

26 files changed

+1483
-1241
lines changed

26 files changed

+1483
-1241
lines changed

‎doc/administrator/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ note that the docker setup is not officially supported.
2424

2525
.. _ansible role: https://github.com/pretalx/ansible-pretalx
2626
.. _docker-compose setup: https://github.com/pretalx/pretalx-docker
27-
.. _pretalx.com: https://pretalx.com
27+
.. _pretalx.com: https://pretalx.com/p/about/

‎doc/changelog.rst‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
.. _changelog:
22

33
Release Notes
4-
=============
5-
64
- :feature:`orga:sidebar` Renamed CfP to Call for Speakers for clarity
5+
- :feature:`lang` pretalx now comes with new translations, in Dutch and Italian!
76
- :feature:`orga,820` Restricted tracks now link to the page where you can create access codes for that track.
87
- :announcement:`admin,1678` Due to its incomplete and complex nature, the ``import_schedule`` admin command has been removed. If you want to import a schedule, despite all the complexities, please use the pretalx-downstream plugin instead.
98
- :feature:`orga,1672` The organiser area now has a search box located in the side bar, opened after clicking the event name. It searches all events the current user has full access to (that is, not a limited reviewer account) for events, sessions and speakers.
@@ -36,7 +35,7 @@ Release Notes
3635
- :feature:`orga:schedule` The schedule editor page can now be printed – page breaks can still occur in odd places, but it's otherwise a very readable schedule (with your selection of rooms).
3736
- :feature:`dev` Plugins can now inject content into a page's HTML ``<head>`` tag with the ``pretalx.orga.signals.html_head`` signal.
3837
- :bug:`orga` Answers for URL questions were not included in JSON/CSV exports
39-
- :announcement:`schedule` The primary URL of widget scripts and widget data has changed. The old URLs will continue until at least the last 2024 release.
38+
- :announcement:`schedule` The primary URL of widget scripts and widget data has changed. The old URLs will continue to work until at least the last 2024 release.
4039
- :announcement:`schedule` The old v1 schedule widget, which has been deprecated for a long time, has been removed.
4140
- :feature:`orga` Tracks and session types in speaker information notes have a better interface, helpful for events with many of either of them.
4241
- :feature:`orga:review,1462` Reviewers can now remove their reviews (while they can still be edited).

‎doc/developer/contributing.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ If you are not familiar with GitHub, the workflow is basically this: You
2323
register an account on GitHub, then you “fork” pretalx, and work on your copy
2424
of it until you're done. Then, you submit your changes as a Pull Request. We'll
2525
review the PR and help you make any changes required to get it merged. Have a
26-
look at the `GitHub guides`_ and other documentation on git for further
26+
look at the `GitHub documentation`_ and other documentation on git for further
2727
information.
2828

2929
We have tagged some issues as small_, and they are probably a good place to
@@ -136,7 +136,7 @@ you do, please note that these are the meanings we ascribe to them:
136136

137137
.. _open an issue: https://github.com/pretalx/pretalx/issues/new
138138
.. _GitHub: https://github.com/pretalx/pretalx
139-
.. _GitHub guides: https://guides.github.com/
139+
.. _GitHub documentation: https://docs.github.com/en/pull-requests
140140
.. _small: https://github.com/pretalx/pretalx/issues?q=is%3Aissue+is%3Aopen+label%3Asize%3Asmall
141141
.. _PEP8: https://legacy.python.org/dev/peps/pep-0008/
142142
.. _Django project style guide: https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/coding-style/

‎doc/developer/plugins/plugins.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,5 +168,5 @@ Which you can use in your code like this::
168168
.. _Django application: https://docs.djangoproject.com/en/dev/ref/applications/
169169
.. _signal dispatcher: https://docs.djangoproject.com/en/dev/topics/signals/
170170
.. _namespace packages: http://legacy.python.org/dev/peps/pep-0420/
171-
.. _entry point: https://setuptools.readthedocs.io/en/latest/pkg_resources.html#locating-plugins
171+
.. _entry point: https://setuptools.pypa.io/en/latest/pkg_resources.html#locating-plugins
172172
.. _cookiecutter: https://cookiecutter.readthedocs.io/en/latest/

‎doc/developer/setup.rst‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ Please make sure you have the following dependencies installed:
3232
| git | ``git`` |
3333
+----------------------------------+------------------+
3434

35-
If your operating system does not provide Python 3.9 or newer, you might need
36-
to `compile it yourself`_ or install it from the `unstable` or `experimental`
37-
repositories.
38-
3935
Some Python dependencies might also need a compiler during installation, the Debian package
4036
``build-essential`` or something similar should suffice.
4137

@@ -210,5 +206,3 @@ Then, go to http://localhost:8081 for a version of the documentation that
210206
automatically re-builds when you save a changed source file.
211207
Please note that changes in the static files (stylesheets and JavaScript) will only be reflected
212208
after a restart.
213-
214-
.. _compile it yourself: https://unix.stackexchange.com/a/332658/2013

‎doc/funding.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ And, of course, if you'd rather :ref:`contribute <contributing>` your time, we'r
6262
.. _pretalx.com: https://pretalx.com
6363
.. _sponsorship: https://github.com/pretalx/pretalx/labels/sponsorship
6464
.. _long list: https://github.com/pretalx/pretalx/wiki/Events
65-
.. _Patreon: https://patreon.com/rixx
65+
.. _Patreon: https://www.patreon.com/rixx
6666
.. _other donation options: https://rixx.de/funding/

‎doc/maintainer/release.rst‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,32 @@ Boarding checks
1818
10. Are there any ``@pytest.mark.xfail`` that you have to resolve?
1919
11. Are the :ref:`changelog` well-phrased and complete?
2020
12. Are there `open pull requests <https://github.com/pretalx/pretalx/pulls>`_ that you should merge?
21+
13. Are all tests passing in CI?
22+
14. Have you written (and not pushed) a blog post? It should contain at least major features and all contributors involved in the release.
2123

2224
System checks
2325
-------------
2426

25-
1. Are you in the branch and commit you think you are in?
26-
2. Are all tests passing?
27-
3. Have you deployed the release-ready commit to an instance? Did the upgrade work?
28-
4. Have you written (and not pushed) a blog post? It should contain at least major features and all contributors involved in the release.
29-
5. Have you told people who may need to know about the release ahead of time? (Plugin developers, clients, self-hosting instances, etc.)
27+
1. Deploy the release-ready commit to an instance. Check if the upgrade and the instance works.
28+
2. Clone pretalx into a clean repo: ``git clone git@github.com:pretalx/pretalx pretalx-release && mkvirtualenv pretalx-release && pip install -e .[dev]``
29+
3. Run ``pytest`` **locally**.
30+
5. Run ``check-manifest`` **locally**.
3031

3132
Take-off and landing
3233
--------------------
3334

34-
1. Clone pretalx into a clean repo: ``git clone git@github.com:pretalx/pretalx pretalx-release && mkvirtualenv pretalx-release && pip install -e .[dev]``
35-
2. Run ``check-manifest`` **locally**.
36-
3. Bump version in ``src/pretalx/__init__.py``.
37-
4. Add the release to the :ref:`changelog`.
38-
5. Make a commit with the message ``Release vx.y.z``
39-
6. Tag the commit: ``git tag vx.y.z -m``
40-
7. Remove old build artefacts: ``rm -rf dist/ build/ pretalx.egg-info``
41-
8. Build a new release: ``python -m build -n``
42-
9. Upload the release: ``twine upload dist/pretalx-x.y.z.tar.gz``
43-
10. Push the release: ``git push && git push --tags``
44-
11. Install/update the package somewhere.
45-
12. Add the release on `GitHub <https://github.com/pretalx/pretalx/releases>`_ (upload the archive you uploaded to PyPI, and add a link to the correct section of the :ref:`changelog`)
46-
13. Push the blog post.
47-
14. Upgrade `the docker repository <https://github.com/pretalx/pretalx-docker>`_ to the current commit **and tag the commit as vx.y.z**.
48-
15. Increment version number to version+1.dev0 in ``src/pretalx/__init__.py``.
49-
16. Update version numbers in update checker and deploy.
50-
17. ``rm -rf pretalx-release && deactivate && rmvirtualenv pretalx-release``
51-
18. Update any plugins waiting for the new release.
35+
1. Bump version in ``src/pretalx/__init__.py``.
36+
2. Add the release to the :ref:`changelog`.
37+
3. Make a release commit: ``RELEASE=vx.y.z && git commit -am "Release $RELEASE" && git tag $RELEASE -m "Release $RELEASE"``
38+
4. Build a new release: ``rm -rf dist/ build/ pretalx.egg-info && python -m build -n``
39+
5. Upload the release: ``twine upload dist/pretalx-x.y.z.tar.gz``
40+
6. Push the release: ``git push && git push --tags``
41+
7. Install/update the package somewhere.
42+
8. Add the release on `GitHub <https://github.com/pretalx/pretalx/releases>`_ (upload the archive you uploaded to PyPI, and add a link to the correct section of the :ref:`changelog`)
43+
9. Publish the blog post.
44+
10. Upgrade `the docker repository <https://github.com/pretalx/pretalx-docker>`_ to the current commit **and tag the commit as vx.y.z**.
45+
11. Increment version number to version+1.dev0 in ``src/pretalx/__init__.py``.
46+
12. Update version numbers in update checker and deploy.
47+
13. ``rm -rf pretalx-release && deactivate && rmvirtualenv pretalx-release``
48+
14. Update any plugins waiting for the new release.
49+
15. Check if the docker image build was successful.

‎src/pretalx/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "2023.2.0.dev0"
1+
__version__ = "2024.2.0.dev0"

‎src/pretalx/common/forms/fields.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ class ExtensionFileField(ExtensionFileInput, SizeFileInput, FileField):
105105

106106

107107
class ImageField(ExtensionFileInput, SizeFileInput, FileField):
108-
# TODO: add better image field widget
109108
widget = ImageInput
110109

111110
def __init__(self, *args, **kwargs):

‎src/pretalx/common/views.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ def is_form_bound(request, form_name, form_param="form"):
4747

4848

4949
def get_static(request, path, content_type): # pragma: no cover
50-
"""TODO: move to staticfiles usage as per https://gist.github.com/SmileyChris/8d472f2a67526e36f39f3c33520182bc
51-
This would avoid potential directory traversal by … a malicious urlconfig, so not a huge attack vector.
52-
"""
5350
path = settings.BASE_DIR / "pretalx/static" / path
5451
if not path.exists():
5552
raise Http404()

0 commit comments

Comments
 (0)