Merge branch 'fossasia:development' into development

fossasia · Feb 20, 2024 · c6aa9ef · c6aa9ef
2 parents 37e413a + e45c3cc
commit c6aa9ef
Show file tree

Hide file tree

Showing 25 changed files with 1,461 additions and 1,231 deletions.
diff --git a/doc/administrator/index.rst b/doc/administrator/index.rst
@@ -24,4 +24,4 @@ note that the docker setup is not officially supported.
 
 .. _ansible role: https://github.com/pretalx/ansible-pretalx
 .. _docker-compose setup: https://github.com/pretalx/pretalx-docker
-.. _pretalx.com: https://pretalx.com
+.. _pretalx.com: https://pretalx.com/p/about/
diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -1,9 +1,8 @@
 .. _changelog:
 
 Release Notes
-=============
-
 - :feature:`orga:sidebar` Renamed CfP to Call for Speakers for clarity
+- :feature:`lang` pretalx now comes with new translations, in Dutch and Italian!
 - :feature:`orga,820` Restricted tracks now link to the page where you can create access codes for that track.
 - :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.
 - :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
 - :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).
 - :feature:`dev` Plugins can now inject content into a page's HTML ``<head>`` tag with the ``pretalx.orga.signals.html_head`` signal.
 - :bug:`orga` Answers for URL questions were not included in JSON/CSV exports
-- :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.
+- :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.
 - :announcement:`schedule` The old v1 schedule widget, which has been deprecated for a long time, has been removed.
 - :feature:`orga` Tracks and session types in speaker information notes have a better interface, helpful for events with many of either of them.
 - :feature:`orga:review,1462` Reviewers can now remove their reviews (while they can still be edited).

diff --git a/doc/developer/contributing.rst b/doc/developer/contributing.rst
@@ -23,7 +23,7 @@ If you are not familiar with GitHub, the workflow is basically this: You
 register an account on GitHub, then you “fork” pretalx, and work on your copy
 of it until you're done. Then, you submit your changes as a Pull Request. We'll
 review the PR and help you make any changes required to get it merged.  Have a
-look at the `GitHub guides`_ and other documentation on git for further
+look at the `GitHub documentation`_ and other documentation on git for further
 information.
 
 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:
 
 .. _open an issue: https://github.com/pretalx/pretalx/issues/new
 .. _GitHub: https://github.com/pretalx/pretalx
-.. _GitHub guides: https://guides.github.com/
+.. _GitHub documentation: https://docs.github.com/en/pull-requests
 .. _small: https://github.com/pretalx/pretalx/issues?q=is%3Aissue+is%3Aopen+label%3Asize%3Asmall
 .. _PEP8: https://legacy.python.org/dev/peps/pep-0008/
 .. _Django project style guide: https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/coding-style/

diff --git a/doc/developer/plugins/plugins.rst b/doc/developer/plugins/plugins.rst
@@ -168,5 +168,5 @@ Which you can use in your code like this::
 .. _Django application: https://docs.djangoproject.com/en/dev/ref/applications/
 .. _signal dispatcher: https://docs.djangoproject.com/en/dev/topics/signals/
 .. _namespace packages: http://legacy.python.org/dev/peps/pep-0420/
-.. _entry point: https://setuptools.readthedocs.io/en/latest/pkg_resources.html#locating-plugins
+.. _entry point: https://setuptools.pypa.io/en/latest/pkg_resources.html#locating-plugins
 .. _cookiecutter: https://cookiecutter.readthedocs.io/en/latest/
diff --git a/doc/developer/setup.rst b/doc/developer/setup.rst
@@ -32,10 +32,6 @@ Please make sure you have the following dependencies installed:
 | git                              | ``git``          |
 +----------------------------------+------------------+
 
-If your operating system does not provide Python 3.9 or newer, you might need
-to `compile it yourself`_ or install it from the `unstable` or `experimental`
-repositories.
-
 Some Python dependencies might also need a compiler during installation, the Debian package
 ``build-essential`` or something similar should suffice.
 
@@ -210,5 +206,3 @@ Then, go to http://localhost:8081 for a version of the documentation that
 automatically re-builds when you save a changed source file.
 Please note that changes in the static files (stylesheets and JavaScript) will only be reflected
 after a restart.
-
-.. _compile it yourself: https://unix.stackexchange.com/a/332658/2013
diff --git a/doc/funding.rst b/doc/funding.rst
@@ -62,5 +62,5 @@ And, of course, if you'd rather :ref:`contribute <contributing>` your time, we'r
 .. _pretalx.com: https://pretalx.com
 .. _sponsorship: https://github.com/pretalx/pretalx/labels/sponsorship
 .. _long list: https://github.com/pretalx/pretalx/wiki/Events
-.. _Patreon: https://patreon.com/rixx
+.. _Patreon: https://www.patreon.com/rixx
 .. _other donation options: https://rixx.de/funding/
diff --git a/doc/maintainer/release.rst b/doc/maintainer/release.rst
@@ -18,34 +18,32 @@ Boarding checks
 10. Are there any ``@pytest.mark.xfail`` that you have to resolve?
 11. Are the :ref:`changelog` well-phrased and complete?
 12. Are there `open pull requests <https://github.com/pretalx/pretalx/pulls>`_ that you should merge?
+13. Are all tests passing in CI?
+14. Have you written (and not pushed) a blog post? It should contain at least major features and all contributors involved in the release.
 
 System checks
 -------------
 
-1. Are you in the branch and commit you think you are in?
-2. Are all tests passing?
-3. Have you deployed the release-ready commit to an instance? Did the upgrade work?
-4. Have you written (and not pushed) a blog post? It should contain at least major features and all contributors involved in the release.
-5. Have you told people who may need to know about the release ahead of time? (Plugin developers, clients, self-hosting instances, etc.)
+1. Deploy the release-ready commit to an instance. Check if the upgrade and the instance works.
+2. Clone pretalx into a clean repo: ``git clone [email protected]:pretalx/pretalx pretalx-release && mkvirtualenv pretalx-release && pip install -e .[dev]``
+3. Run ``pytest`` **locally**.
+5. Run ``check-manifest`` **locally**.
 
 Take-off and landing
 --------------------
 
-1. Clone pretalx into a clean repo: ``git clone [email protected]:pretalx/pretalx pretalx-release && mkvirtualenv pretalx-release && pip install -e .[dev]``
-2. Run ``check-manifest`` **locally**.
-3. Bump version in ``src/pretalx/__init__.py``.
-4. Add the release to the :ref:`changelog`.
-5. Make a commit with the message ``Release vx.y.z``
-6. Tag the commit: ``git tag vx.y.z -m``
-7. Remove old build artefacts: ``rm -rf dist/ build/ pretalx.egg-info``
-8. Build a new release: ``python -m build -n``
-9. Upload the release: ``twine upload dist/pretalx-x.y.z.tar.gz``
-10. Push the release: ``git push && git push --tags``
-11. Install/update the package somewhere.
-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`)
-13. Push the blog post.
-14. Upgrade `the docker repository <https://github.com/pretalx/pretalx-docker>`_ to the current commit **and tag the commit as vx.y.z**.
-15. Increment version number to version+1.dev0 in ``src/pretalx/__init__.py``.
-16. Update version numbers in update checker and deploy.
-17. ``rm -rf pretalx-release && deactivate && rmvirtualenv pretalx-release``
-18. Update any plugins waiting for the new release.
+1. Bump version in ``src/pretalx/__init__.py``.
+2. Add the release to the :ref:`changelog`.
+3. Make a release commit: ``RELEASE=vx.y.z && git commit -am "Release $RELEASE" && git tag $RELEASE -m "Release $RELEASE"``
+4. Build a new release: ``rm -rf dist/ build/ pretalx.egg-info && python -m build -n``
+5. Upload the release: ``twine upload dist/pretalx-x.y.z.tar.gz``
+6. Push the release: ``git push && git push --tags``
+7. Install/update the package somewhere.
+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`)
+9. Publish the blog post.
+10. Upgrade `the docker repository <https://github.com/pretalx/pretalx-docker>`_ to the current commit **and tag the commit as vx.y.z**.
+11. Increment version number to version+1.dev0 in ``src/pretalx/__init__.py``.
+12. Update version numbers in update checker and deploy.
+13. ``rm -rf pretalx-release && deactivate && rmvirtualenv pretalx-release``
+14. Update any plugins waiting for the new release.
+15. Check if the docker image build was successful.
diff --git a/src/pretalx/__init__.py b/src/pretalx/__init__.py
@@ -1 +1 @@
-__version__ = "2023.2.0.dev0"
+__version__ = "2024.2.0.dev0"
diff --git a/src/pretalx/common/forms/fields.py b/src/pretalx/common/forms/fields.py
@@ -105,7 +105,6 @@ class ExtensionFileField(ExtensionFileInput, SizeFileInput, FileField):
 
 
 class ImageField(ExtensionFileInput, SizeFileInput, FileField):
-    # TODO: add better image field widget
     widget = ImageInput
 
     def __init__(self, *args, **kwargs):

diff --git a/src/pretalx/common/views.py b/src/pretalx/common/views.py
@@ -47,9 +47,6 @@ def is_form_bound(request, form_name, form_param="form"):
 
 
 def get_static(request, path, content_type):  # pragma: no cover
-    """TODO: move to staticfiles usage as per https://gist.github.com/SmileyChris/8d472f2a67526e36f39f3c33520182bc
-    This would avoid potential directory traversal by … a malicious urlconfig, so not a huge attack vector.
-    """
     path = settings.BASE_DIR / "pretalx/static" / path
     if not path.exists():
         raise Http404()
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = "2023.2.0.dev0"
		__version__ = "2024.2.0.dev0"