diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index f2e73352b..e3a3d7401 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -10,11 +10,12 @@ assignees: "" A clear and concise description of what the bug is. **How to Reproduce** -Steps to reproduce the behavior: preferably on [nighty](https://nightly.demo.openslides.org) +Steps to reproduce the behavior: preferably on [nightly](https://nightly.demo.openslides.org) (for +3.4) or the [OS4 demo](https://demo.os4.openslides.com/). 1. Go to '...' -2. Click on '....' -3. Scroll down to '....' +2. Click on '...' +3. Scroll down to '...' 4. See error **Expected behavior** @@ -22,16 +23,16 @@ A clear and concise description of what you expected to happen. **System information** -- OpenSlides-Version: [e.g. 2.1, 2.2, 2.3, 3,0] -- Additional version information (if any): [e.g. commit hash or installation-month] -- Python Version: [e.g. 3,5, 3.6, 3.7] -- Device: [e.g. iPhone6, Notebook] -- OS: [e.g. Andoird 7, iOS8.1, Windows 10] +- OpenSlides-Version: [e.g. 3.4, 4.0-beta] +- Additional version information (if any): [e.g. commit hash or installation month] +- Python Version: [e.g. 3.6, 3.7, 3.8] +- Device: [e.g. iPhone 6, Notebook] +- OS: [e.g. Android 7, iOS 8.1, Windows 10] - Browser: [e.g. chrome, firefox, opera, edge, safari] - Browser-Version: [e.g. 22] **Additional context** -Add any other information to comprehend your problem +Add any other information to comprehend your problem. **Screenshots** If applicable, add screenshots to help explain your problem. diff --git a/README.rst b/README.rst index 71f7f177d..4e00b2ea6 100644 --- a/README.rst +++ b/README.rst @@ -21,11 +21,9 @@ instructions `_. Get OpenSlides -------------- -First, you have to clone this repository, then checkout the latest stable branch:: +First, you have to clone this repository to the latest stable branch:: - git clone https://github.com/OpenSlides/OpenSlides.git --recurse-submodules - cd OpenSlides/ - git checkout stable/3.4.x + git clone -b stable/3.4.x --single-branch https://github.com/OpenSlides/OpenSlides.git --recurse-submodules **Note about migrating from version 3.3 or earlier**: With OpenSlides 3.4 submodules and a Docker setup were introduced. If you ran into problems try to delete your diff --git a/server/requirements/development.txt b/server/requirements/development.txt index a6638a5fe..f211c897e 100644 --- a/server/requirements/development.txt +++ b/server/requirements/development.txt @@ -1,11 +1,11 @@ -black==21.7b0 -coverage -flake8 -isort<5.0.0 -mypy<0.920 -pytest<5.4.2 -pytest-django<3.9.0 -pytest-asyncio<0.11.0 -pytest-cov<2.8.2 -types-bleach -types-pkg_resources +black==22.3.0 +coverage==6.2 +flake8==4.0.1 +isort==4.3.21 +mypy==0.910 +pytest==5.4.1 +pytest-django==3.8.0 +pytest-asyncio==0.10.0 +pytest-cov==2.8.1 +types-bleach>=3.3.0,<5.0.0 +types-pkg_resources==0.1.3 diff --git a/server/requirements/production.txt b/server/requirements/production.txt index 6486570ad..ca8a093c5 100644 --- a/server/requirements/production.txt +++ b/server/requirements/production.txt @@ -1,13 +1,9 @@ -# asgiref: A never ending story of incompatibility and issues -# - Use release 3.2.9 with this issue fixed: https://github.com/django/asgiref/issues/170 -# introduced with 3.2.8 -asgiref>=3.2.9 - # Requirements for OpenSlides in production in alphabetical order aioredis>=1.1.0,<1.3 -bleach>=3.3.0 +asgiref>=3.2.9,<=3.4.1 +bleach>=3.3.0,<5.0.0 Django>=2.1,<2.3 -djangorestframework>=3.11.2 +djangorestframework>=3.11.2,<=3.13.1 jsonfield2>=3.0,<3.1 jsonschema>=3.0,<3.1 mypy_extensions>=0.4,<0.5 @@ -15,8 +11,8 @@ psycopg2-binary>=2.7.3.2,<2.9 PyPDF2>=1.26,<1.27 roman>=2.0,<3.2 setuptools>=29.0,<42.0 -typing_extensions>=3.6.6,<3.8 -twisted[tls]>=20.3.0 +typing_extensions==3.10.0.0 +twisted[tls]>=20.3.0,<=22.4.0 uvicorn[standard]>=0.9,<1.0 # https://github.com/benoitc/gunicorn/issues/1913