From e1063262b88d516f9f72332a958fdb7c193b8625 Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Wed, 26 Jul 2023 11:34:59 +0200 Subject: [PATCH 01/15] Added changelog entry --- CHANGELOG.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f8e9235..dedace3 100755 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,8 @@ Changelog Development ----------- +* Updated Django requirement + 1.0.3 (2022-09-01) ------------------ * Fixed test requirements in ``setup.py`` From d833d87e420fc9e3bf56fb5e05909d8e9ba30478 Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Wed, 26 Jul 2023 15:33:52 +0200 Subject: [PATCH 02/15] Updated the requirement files --- requirements/dev.in | 4 +- requirements/dev.txt | 168 +++++++++++++++++++++++-------------------- requirements/tox.in | 6 +- requirements/tox.txt | 35 ++++----- 4 files changed, 110 insertions(+), 103 deletions(-) diff --git a/requirements/dev.in b/requirements/dev.in index 7f17bf7..c15daf3 100755 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -1,8 +1,8 @@ -r tox.in asgiref<3.4.0 -channels -django +channels>=3.0,<3.1 +Django>=3.2,<4.0 django-channels-presence flake8 isort diff --git a/requirements/dev.txt b/requirements/dev.txt index ad3c171..5c2fce4 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=dev.txt dev.in # -alabaster==0.7.12 +alabaster==0.7.13 # via sphinx asgiref==3.3.4 # via @@ -12,11 +12,9 @@ asgiref==3.3.4 # channels # daphne # django -astroid==2.6.6 +astroid==2.15.6 # via pylint -atomicwrites==1.4.0 - # via pytest -attrs==21.2.0 +attrs==23.1.0 # via # automat # pytest @@ -26,119 +24,122 @@ autobahn==21.2.1 # via # -r tox.in # daphne -automat==20.2.0 +automat==22.10.0 # via twisted -babel==2.9.1 +babel==2.12.1 # via sphinx -certifi==2021.5.30 +build==0.10.0 + # via pip-tools +certifi==2023.7.22 # via requests -cffi==1.14.6 +cffi==1.15.1 # via cryptography channels==3.0.4 # via -r dev.in -charset-normalizer==2.0.4 +charset-normalizer==3.2.0 # via requests -click==8.0.1 +click==8.1.6 # via pip-tools -colorama==0.4.4 - # via - # click - # pylint - # pytest - # sphinx constantly==15.1.0 # via twisted -coverage==5.5 +coverage==7.2.7 # via # -r tox.in # pytest-cov -cryptography==3.4.7 +cryptography==41.0.2 # via # autobahn # pyopenssl # service-identity daphne==3.0.2 # via channels -django==3.2.6 +dill==0.3.7 + # via pylint +django==3.2.20 # via # -r dev.in # channels django-channels-presence==1.0.0 # via -r dev.in -docutils==0.16 +docutils==0.18.1 # via # sphinx # sphinx-rtd-theme -flake8==3.9.2 +flake8==6.0.0 # via -r dev.in hyperlink==21.0.0 # via # autobahn # twisted -idna==3.2 +idna==3.4 # via # hyperlink # requests # twisted -imagesize==1.2.0 +imagesize==1.4.1 + # via sphinx +importlib-metadata==6.8.0 # via sphinx -incremental==21.3.0 +incremental==22.10.0 # via twisted -iniconfig==1.1.1 +iniconfig==2.0.0 # via pytest -isort==5.9.3 +isort==5.12.0 # via # -r dev.in # pylint -jinja2==2.11.3 +jinja2==3.1.2 # via # sphinx # sphinx-js -lazy-object-proxy==1.6.0 +lazy-object-proxy==1.9.0 # via astroid markupsafe==2.0.1 - # via jinja2 -mccabe==0.6.1 + # via + # jinja2 + # sphinx-js +mccabe==0.7.0 # via # flake8 # pylint -packaging==21.0 +packaging==23.1 # via + # build # pytest # sphinx -parsimonious==0.7.0 +parsimonious==0.10.0 # via sphinx-js -pep517==0.11.0 - # via pip-tools -pip-tools==6.2.0 +pip-tools==7.1.0 # via -r dev.in -pluggy==0.13.1 +platformdirs==3.9.1 + # via pylint +pluggy==1.2.0 # via pytest -py==1.10.0 +py==1.11.0 # via pytest -pyasn1==0.4.8 +pyasn1==0.5.0 # via # pyasn1-modules # service-identity -pyasn1-modules==0.2.8 +pyasn1-modules==0.3.0 # via service-identity -pycodestyle==2.7.0 +pycodestyle==2.10.0 # via flake8 -pycparser==2.20 +pycparser==2.21 # via cffi -pydocstyle==6.1.1 +pydocstyle==6.3.0 # via -r dev.in -pyflakes==2.3.1 +pyflakes==3.0.1 # via flake8 -pygments==2.10.0 +pygments==2.15.1 # via sphinx -pylint==2.9.6 +pylint==2.17.5 # via -r dev.in -pyopenssl==20.0.1 +pyopenssl==23.2.0 # via twisted -pyparsing==2.4.7 - # via packaging -pytest==6.2.4 +pyproject-hooks==1.0.0 + # via build +pytest==6.2.5 # via # -r tox.in # pytest-asyncio @@ -149,71 +150,82 @@ pytest-asyncio==0.15.1 # via -r tox.in pytest-cov==2.12.1 # via -r tox.in -pytest-django==4.4.0 +pytest-django==4.5.2 # via -r tox.in -pytest-pythonpath==0.7.3 +pytest-pythonpath==0.7.4 # via -r tox.in -pytz==2021.1 +pytz==2023.3 # via # babel # django -requests==2.26.0 +regex==2023.6.3 + # via parsimonious +requests==2.31.0 # via sphinx -service-identity==21.1.0 +service-identity==23.1.0 # via twisted six==1.16.0 - # via - # automat - # parsimonious - # pyopenssl - # service-identity -snowballstemmer==2.1.0 + # via automat +snowballstemmer==2.2.0 # via # pydocstyle # sphinx -sphinx==4.1.2 +sphinx==5.3.0 # via # -r dev.in # sphinx-js # sphinx-rtd-theme -sphinx-js==3.1.2 + # sphinxcontrib-jquery +sphinx-js==3.2.1 # via -r dev.in -sphinx-rtd-theme==0.5.2 +sphinx-rtd-theme==1.2.2 # via -r dev.in -sphinxcontrib-applehelp==1.0.2 +sphinxcontrib-applehelp==1.0.4 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.0.1 # via sphinx +sphinxcontrib-jquery==4.1 + # via sphinx-rtd-theme sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -sqlparse==0.4.1 +sqlparse==0.4.4 # via django toml==0.10.2 # via - # pylint # pytest # pytest-cov -tomli==1.2.1 - # via pep517 -twisted[tls]==21.7.0 +tomli==2.0.1 + # via + # build + # pip-tools + # pylint + # pyproject-hooks +tomlkit==0.11.8 + # via pylint +twisted[tls]==22.10.0 # via daphne -txaio==21.2.1 +txaio==23.1.1 # via autobahn -typing-extensions==3.10.0.0 - # via twisted -urllib3==1.26.6 +typing-extensions==4.7.1 + # via + # astroid + # pylint + # twisted +urllib3==2.0.4 # via requests -wheel==0.37.0 +wheel==0.41.0 # via pip-tools -wrapt==1.12.1 +wrapt==1.15.0 # via astroid -zope.interface==5.4.0 +zipp==3.16.2 + # via importlib-metadata +zope.interface==6.0 # via twisted # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/tox.in b/requirements/tox.in index 6b9b4bd..b907adf 100755 --- a/requirements/tox.in +++ b/requirements/tox.in @@ -1,7 +1,7 @@ autobahn<21.2.2 coverage -pytest -pytest-asyncio +pytest<7 +pytest-asyncio>=0.15,<0.16 pytest-django -pytest-cov +pytest-cov>=2,<3 pytest-pythonpath diff --git a/requirements/tox.txt b/requirements/tox.txt index 81801f7..a9d514f 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -4,39 +4,34 @@ # # pip-compile --output-file=tox.txt tox.in # -atomicwrites==1.4.0 - # via pytest -attrs==21.2.0 + +attrs==23.1.0 # via pytest autobahn==21.2.1 # via -r tox.in -cffi==1.14.6 +cffi==1.15.1 # via cryptography -colorama==0.4.4 - # via pytest -coverage==5.5 +coverage==7.2.7 # via # -r tox.in # pytest-cov -cryptography==3.4.7 +cryptography==41.0.2 # via autobahn hyperlink==21.0.0 # via autobahn -idna==3.2 +idna==3.4 # via hyperlink -iniconfig==1.1.1 +iniconfig==2.0.0 # via pytest -packaging==21.0 +packaging==23.1 # via pytest -pluggy==0.13.1 +pluggy==1.2.0 # via pytest -py==1.10.0 +py==1.11.0 # via pytest -pycparser==2.20 +pycparser==2.21 # via cffi -pyparsing==2.4.7 - # via packaging -pytest==6.2.4 +pytest==6.2.5 # via # -r tox.in # pytest-asyncio @@ -47,13 +42,13 @@ pytest-asyncio==0.15.1 # via -r tox.in pytest-cov==2.12.1 # via -r tox.in -pytest-django==4.4.0 +pytest-django==4.5.2 # via -r tox.in -pytest-pythonpath==0.7.3 +pytest-pythonpath==0.7.4 # via -r tox.in toml==0.10.2 # via # pytest # pytest-cov -txaio==21.2.1 +txaio==23.1.1 # via autobahn From 91e6e229ac40abed1939ea49a0520905fe5cf953 Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Wed, 26 Jul 2023 15:43:56 +0200 Subject: [PATCH 03/15] Removed deprecated Python 3.6 version from the tests --- .github/workflows/tests.yml | 2 +- setup.py | 1 - tox.ini | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0ea2b9c..944b3ce 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 diff --git a/setup.py b/setup.py index 426e363..2afe940 100755 --- a/setup.py +++ b/setup.py @@ -76,7 +76,6 @@ def command_factory(name, base_class): Operating System :: OS Independent Programming Language :: JavaScript Programming Language :: Python -Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 diff --git a/tox.ini b/tox.ini index edda203..6395d3a 100755 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = flake8 - py{36,37,38,39}-django{30,31,32} + py{37,38,39}-django{30,31,32} skipsdist = true #skip_missing_interpreters=true From f87c3cc496a1b49d9f25144912876d01bd57892c Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Wed, 26 Jul 2023 16:01:16 +0200 Subject: [PATCH 04/15] Use tox < 4 for testing --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 944b3ce..e7a585f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install tox tox-factor coverage + pip install tox<4 tox-factor coverage - name: Lint with flake8 run: tox -e flake8 if: matrix.python-version == '3.8' @@ -48,6 +48,7 @@ jobs: uses: actions/setup-node@v2 with: node-version: '12' + - name: Install dependencies - name: Install dependencies run: npm install - name: Run tests From 49947b88448d573f95fe6d233a98bb352c3126b3 Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Wed, 26 Jul 2023 16:02:05 +0200 Subject: [PATCH 05/15] Removed typo --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e7a585f..67c987c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -48,7 +48,6 @@ jobs: uses: actions/setup-node@v2 with: node-version: '12' - - name: Install dependencies - name: Install dependencies run: npm install - name: Run tests From d22a6345ae9fe7ae7dae507a0b69a2fd4150d047 Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Thu, 27 Jul 2023 13:07:36 +0200 Subject: [PATCH 06/15] Possible for the broken install deps step --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 67c987c..5cbf8d2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install tox<4 tox-factor coverage + pip install "tox<4" tox-factor coverage - name: Lint with flake8 run: tox -e flake8 if: matrix.python-version == '3.8' From b15959853d977fc2744351934119badc6681cbe3 Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Thu, 27 Jul 2023 14:35:22 +0200 Subject: [PATCH 07/15] Reverted requirements --- requirements/dev.in | 4 +- requirements/dev.txt | 168 ++++++++++++++++++++----------------------- requirements/tox.in | 6 +- requirements/tox.txt | 35 +++++---- 4 files changed, 103 insertions(+), 110 deletions(-) diff --git a/requirements/dev.in b/requirements/dev.in index c15daf3..7f17bf7 100755 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -1,8 +1,8 @@ -r tox.in asgiref<3.4.0 -channels>=3.0,<3.1 -Django>=3.2,<4.0 +channels +django django-channels-presence flake8 isort diff --git a/requirements/dev.txt b/requirements/dev.txt index 5c2fce4..ad3c171 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=dev.txt dev.in # -alabaster==0.7.13 +alabaster==0.7.12 # via sphinx asgiref==3.3.4 # via @@ -12,9 +12,11 @@ asgiref==3.3.4 # channels # daphne # django -astroid==2.15.6 +astroid==2.6.6 # via pylint -attrs==23.1.0 +atomicwrites==1.4.0 + # via pytest +attrs==21.2.0 # via # automat # pytest @@ -24,122 +26,119 @@ autobahn==21.2.1 # via # -r tox.in # daphne -automat==22.10.0 +automat==20.2.0 # via twisted -babel==2.12.1 +babel==2.9.1 # via sphinx -build==0.10.0 - # via pip-tools -certifi==2023.7.22 +certifi==2021.5.30 # via requests -cffi==1.15.1 +cffi==1.14.6 # via cryptography channels==3.0.4 # via -r dev.in -charset-normalizer==3.2.0 +charset-normalizer==2.0.4 # via requests -click==8.1.6 +click==8.0.1 # via pip-tools +colorama==0.4.4 + # via + # click + # pylint + # pytest + # sphinx constantly==15.1.0 # via twisted -coverage==7.2.7 +coverage==5.5 # via # -r tox.in # pytest-cov -cryptography==41.0.2 +cryptography==3.4.7 # via # autobahn # pyopenssl # service-identity daphne==3.0.2 # via channels -dill==0.3.7 - # via pylint -django==3.2.20 +django==3.2.6 # via # -r dev.in # channels django-channels-presence==1.0.0 # via -r dev.in -docutils==0.18.1 +docutils==0.16 # via # sphinx # sphinx-rtd-theme -flake8==6.0.0 +flake8==3.9.2 # via -r dev.in hyperlink==21.0.0 # via # autobahn # twisted -idna==3.4 +idna==3.2 # via # hyperlink # requests # twisted -imagesize==1.4.1 - # via sphinx -importlib-metadata==6.8.0 +imagesize==1.2.0 # via sphinx -incremental==22.10.0 +incremental==21.3.0 # via twisted -iniconfig==2.0.0 +iniconfig==1.1.1 # via pytest -isort==5.12.0 +isort==5.9.3 # via # -r dev.in # pylint -jinja2==3.1.2 +jinja2==2.11.3 # via # sphinx # sphinx-js -lazy-object-proxy==1.9.0 +lazy-object-proxy==1.6.0 # via astroid markupsafe==2.0.1 - # via - # jinja2 - # sphinx-js -mccabe==0.7.0 + # via jinja2 +mccabe==0.6.1 # via # flake8 # pylint -packaging==23.1 +packaging==21.0 # via - # build # pytest # sphinx -parsimonious==0.10.0 +parsimonious==0.7.0 # via sphinx-js -pip-tools==7.1.0 +pep517==0.11.0 + # via pip-tools +pip-tools==6.2.0 # via -r dev.in -platformdirs==3.9.1 - # via pylint -pluggy==1.2.0 +pluggy==0.13.1 # via pytest -py==1.11.0 +py==1.10.0 # via pytest -pyasn1==0.5.0 +pyasn1==0.4.8 # via # pyasn1-modules # service-identity -pyasn1-modules==0.3.0 +pyasn1-modules==0.2.8 # via service-identity -pycodestyle==2.10.0 +pycodestyle==2.7.0 # via flake8 -pycparser==2.21 +pycparser==2.20 # via cffi -pydocstyle==6.3.0 +pydocstyle==6.1.1 # via -r dev.in -pyflakes==3.0.1 +pyflakes==2.3.1 # via flake8 -pygments==2.15.1 +pygments==2.10.0 # via sphinx -pylint==2.17.5 +pylint==2.9.6 # via -r dev.in -pyopenssl==23.2.0 +pyopenssl==20.0.1 # via twisted -pyproject-hooks==1.0.0 - # via build -pytest==6.2.5 +pyparsing==2.4.7 + # via packaging +pytest==6.2.4 # via # -r tox.in # pytest-asyncio @@ -150,82 +149,71 @@ pytest-asyncio==0.15.1 # via -r tox.in pytest-cov==2.12.1 # via -r tox.in -pytest-django==4.5.2 +pytest-django==4.4.0 # via -r tox.in -pytest-pythonpath==0.7.4 +pytest-pythonpath==0.7.3 # via -r tox.in -pytz==2023.3 +pytz==2021.1 # via # babel # django -regex==2023.6.3 - # via parsimonious -requests==2.31.0 +requests==2.26.0 # via sphinx -service-identity==23.1.0 +service-identity==21.1.0 # via twisted six==1.16.0 - # via automat -snowballstemmer==2.2.0 + # via + # automat + # parsimonious + # pyopenssl + # service-identity +snowballstemmer==2.1.0 # via # pydocstyle # sphinx -sphinx==5.3.0 +sphinx==4.1.2 # via # -r dev.in # sphinx-js # sphinx-rtd-theme - # sphinxcontrib-jquery -sphinx-js==3.2.1 +sphinx-js==3.1.2 # via -r dev.in -sphinx-rtd-theme==1.2.2 +sphinx-rtd-theme==0.5.2 # via -r dev.in -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==1.0.2 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.0.0 # via sphinx -sphinxcontrib-jquery==4.1 - # via sphinx-rtd-theme sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -sqlparse==0.4.4 +sqlparse==0.4.1 # via django toml==0.10.2 # via + # pylint # pytest # pytest-cov -tomli==2.0.1 - # via - # build - # pip-tools - # pylint - # pyproject-hooks -tomlkit==0.11.8 - # via pylint -twisted[tls]==22.10.0 +tomli==1.2.1 + # via pep517 +twisted[tls]==21.7.0 # via daphne -txaio==23.1.1 +txaio==21.2.1 # via autobahn -typing-extensions==4.7.1 - # via - # astroid - # pylint - # twisted -urllib3==2.0.4 +typing-extensions==3.10.0.0 + # via twisted +urllib3==1.26.6 # via requests -wheel==0.41.0 +wheel==0.37.0 # via pip-tools -wrapt==1.15.0 +wrapt==1.12.1 # via astroid -zipp==3.16.2 - # via importlib-metadata -zope.interface==6.0 +zope.interface==5.4.0 # via twisted # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/tox.in b/requirements/tox.in index b907adf..6b9b4bd 100755 --- a/requirements/tox.in +++ b/requirements/tox.in @@ -1,7 +1,7 @@ autobahn<21.2.2 coverage -pytest<7 -pytest-asyncio>=0.15,<0.16 +pytest +pytest-asyncio pytest-django -pytest-cov>=2,<3 +pytest-cov pytest-pythonpath diff --git a/requirements/tox.txt b/requirements/tox.txt index a9d514f..81801f7 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -4,34 +4,39 @@ # # pip-compile --output-file=tox.txt tox.in # - -attrs==23.1.0 +atomicwrites==1.4.0 + # via pytest +attrs==21.2.0 # via pytest autobahn==21.2.1 # via -r tox.in -cffi==1.15.1 +cffi==1.14.6 # via cryptography -coverage==7.2.7 +colorama==0.4.4 + # via pytest +coverage==5.5 # via # -r tox.in # pytest-cov -cryptography==41.0.2 +cryptography==3.4.7 # via autobahn hyperlink==21.0.0 # via autobahn -idna==3.4 +idna==3.2 # via hyperlink -iniconfig==2.0.0 +iniconfig==1.1.1 # via pytest -packaging==23.1 +packaging==21.0 # via pytest -pluggy==1.2.0 +pluggy==0.13.1 # via pytest -py==1.11.0 +py==1.10.0 # via pytest -pycparser==2.21 +pycparser==2.20 # via cffi -pytest==6.2.5 +pyparsing==2.4.7 + # via packaging +pytest==6.2.4 # via # -r tox.in # pytest-asyncio @@ -42,13 +47,13 @@ pytest-asyncio==0.15.1 # via -r tox.in pytest-cov==2.12.1 # via -r tox.in -pytest-django==4.5.2 +pytest-django==4.4.0 # via -r tox.in -pytest-pythonpath==0.7.4 +pytest-pythonpath==0.7.3 # via -r tox.in toml==0.10.2 # via # pytest # pytest-cov -txaio==23.1.1 +txaio==21.2.1 # via autobahn From aced15cadb1e94d861792c7b3b86c2e2e6d98c3e Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Thu, 27 Jul 2023 15:06:19 +0200 Subject: [PATCH 08/15] Updated the requirements --- requirements/dev.in | 4 +- requirements/dev.txt | 173 +++++++++++++++++++++++-------------------- requirements/tox.in | 6 +- requirements/tox.txt | 39 +++++----- 4 files changed, 117 insertions(+), 105 deletions(-) diff --git a/requirements/dev.in b/requirements/dev.in index 7f17bf7..22b5d7d 100755 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -1,8 +1,8 @@ -r tox.in asgiref<3.4.0 -channels -django +channels==3.0.4 +Django>=3.2,<4 django-channels-presence flake8 isort diff --git a/requirements/dev.txt b/requirements/dev.txt index ad3c171..52a31fc 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -2,9 +2,12 @@ # This file is autogenerated by pip-compile with python 3.8 # To update, run: # -# pip-compile --output-file=dev.txt dev.in +# pip-compile dev.in # -alabaster==0.7.12 +--index-url https://devpi.cmn.prd.rheinwerk.de/rheinwerk/dev +--trusted-host devpi.cmn.prd.rheinwerk.de + +alabaster==0.7.13 # via sphinx asgiref==3.3.4 # via @@ -12,11 +15,9 @@ asgiref==3.3.4 # channels # daphne # django -astroid==2.6.6 +astroid==2.15.6 # via pylint -atomicwrites==1.4.0 - # via pytest -attrs==21.2.0 +attrs==23.1.0 # via # automat # pytest @@ -26,119 +27,122 @@ autobahn==21.2.1 # via # -r tox.in # daphne -automat==20.2.0 +automat==22.10.0 # via twisted -babel==2.9.1 +babel==2.12.1 # via sphinx -certifi==2021.5.30 +build==0.10.0 + # via pip-tools +certifi==2023.7.22 # via requests -cffi==1.14.6 +cffi==1.15.1 # via cryptography channels==3.0.4 # via -r dev.in -charset-normalizer==2.0.4 +charset-normalizer==3.2.0 # via requests -click==8.0.1 +click==8.1.6 # via pip-tools -colorama==0.4.4 - # via - # click - # pylint - # pytest - # sphinx constantly==15.1.0 # via twisted -coverage==5.5 +coverage==7.2.7 # via # -r tox.in # pytest-cov -cryptography==3.4.7 +cryptography==41.0.2 # via # autobahn # pyopenssl # service-identity daphne==3.0.2 # via channels -django==3.2.6 +dill==0.3.7 + # via pylint +django==3.2.20 # via # -r dev.in # channels django-channels-presence==1.0.0 # via -r dev.in -docutils==0.16 +docutils==0.18.1 # via # sphinx # sphinx-rtd-theme -flake8==3.9.2 +flake8==6.0.0 # via -r dev.in hyperlink==21.0.0 # via # autobahn # twisted -idna==3.2 +idna==3.4 # via # hyperlink # requests # twisted -imagesize==1.2.0 +imagesize==1.4.1 + # via sphinx +importlib-metadata==6.8.0 # via sphinx -incremental==21.3.0 +incremental==22.10.0 # via twisted -iniconfig==1.1.1 +iniconfig==2.0.0 # via pytest -isort==5.9.3 +isort==5.12.0 # via # -r dev.in # pylint -jinja2==2.11.3 +jinja2==3.1.2 # via # sphinx # sphinx-js -lazy-object-proxy==1.6.0 +lazy-object-proxy==1.9.0 # via astroid markupsafe==2.0.1 - # via jinja2 -mccabe==0.6.1 + # via + # jinja2 + # sphinx-js +mccabe==0.7.0 # via # flake8 # pylint -packaging==21.0 +packaging==23.1 # via + # build # pytest # sphinx -parsimonious==0.7.0 +parsimonious==0.10.0 # via sphinx-js -pep517==0.11.0 - # via pip-tools -pip-tools==6.2.0 +pip-tools==7.1.0 # via -r dev.in -pluggy==0.13.1 +platformdirs==3.9.1 + # via pylint +pluggy==1.2.0 # via pytest -py==1.10.0 +py==1.11.0 # via pytest -pyasn1==0.4.8 +pyasn1==0.5.0 # via # pyasn1-modules # service-identity -pyasn1-modules==0.2.8 +pyasn1-modules==0.3.0 # via service-identity -pycodestyle==2.7.0 +pycodestyle==2.10.0 # via flake8 -pycparser==2.20 +pycparser==2.21 # via cffi -pydocstyle==6.1.1 +pydocstyle==6.3.0 # via -r dev.in -pyflakes==2.3.1 +pyflakes==3.0.1 # via flake8 -pygments==2.10.0 +pygments==2.15.1 # via sphinx -pylint==2.9.6 +pylint==2.17.5 # via -r dev.in -pyopenssl==20.0.1 +pyopenssl==23.2.0 # via twisted -pyparsing==2.4.7 - # via packaging -pytest==6.2.4 +pyproject-hooks==1.0.0 + # via build +pytest==6.2.5 # via # -r tox.in # pytest-asyncio @@ -149,71 +153,82 @@ pytest-asyncio==0.15.1 # via -r tox.in pytest-cov==2.12.1 # via -r tox.in -pytest-django==4.4.0 +pytest-django==4.5.2 # via -r tox.in -pytest-pythonpath==0.7.3 +pytest-pythonpath==0.7.4 # via -r tox.in -pytz==2021.1 +pytz==2023.3 # via # babel # django -requests==2.26.0 +regex==2023.6.3 + # via parsimonious +requests==2.31.0 # via sphinx -service-identity==21.1.0 +service-identity==23.1.0 # via twisted six==1.16.0 - # via - # automat - # parsimonious - # pyopenssl - # service-identity -snowballstemmer==2.1.0 + # via automat +snowballstemmer==2.2.0 # via # pydocstyle # sphinx -sphinx==4.1.2 +sphinx==5.3.0 # via # -r dev.in # sphinx-js # sphinx-rtd-theme -sphinx-js==3.1.2 + # sphinxcontrib-jquery +sphinx-js==3.2.1 # via -r dev.in -sphinx-rtd-theme==0.5.2 +sphinx-rtd-theme==1.2.2 # via -r dev.in -sphinxcontrib-applehelp==1.0.2 +sphinxcontrib-applehelp==1.0.4 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.0.1 # via sphinx +sphinxcontrib-jquery==4.1 + # via sphinx-rtd-theme sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -sqlparse==0.4.1 +sqlparse==0.4.4 # via django toml==0.10.2 # via - # pylint # pytest # pytest-cov -tomli==1.2.1 - # via pep517 -twisted[tls]==21.7.0 +tomli==2.0.1 + # via + # build + # pip-tools + # pylint + # pyproject-hooks +tomlkit==0.12.0 + # via pylint +twisted[tls]==22.10.0 # via daphne -txaio==21.2.1 +txaio==23.1.1 # via autobahn -typing-extensions==3.10.0.0 - # via twisted -urllib3==1.26.6 +typing-extensions==4.7.1 + # via + # astroid + # pylint + # twisted +urllib3==2.0.4 # via requests -wheel==0.37.0 +wheel==0.41.0 # via pip-tools -wrapt==1.12.1 +wrapt==1.15.0 # via astroid -zope.interface==5.4.0 +zipp==3.16.2 + # via importlib-metadata +zope.interface==6.0 # via twisted # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/tox.in b/requirements/tox.in index 6b9b4bd..b907adf 100755 --- a/requirements/tox.in +++ b/requirements/tox.in @@ -1,7 +1,7 @@ autobahn<21.2.2 coverage -pytest -pytest-asyncio +pytest<7 +pytest-asyncio>=0.15,<0.16 pytest-django -pytest-cov +pytest-cov>=2,<3 pytest-pythonpath diff --git a/requirements/tox.txt b/requirements/tox.txt index 81801f7..cf4b81a 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -2,41 +2,38 @@ # This file is autogenerated by pip-compile with python 3.8 # To update, run: # -# pip-compile --output-file=tox.txt tox.in +# pip-compile tox.in # -atomicwrites==1.4.0 - # via pytest -attrs==21.2.0 +--index-url https://devpi.cmn.prd.rheinwerk.de/rheinwerk/dev +--trusted-host devpi.cmn.prd.rheinwerk.de + +attrs==23.1.0 # via pytest autobahn==21.2.1 # via -r tox.in -cffi==1.14.6 +cffi==1.15.1 # via cryptography -colorama==0.4.4 - # via pytest -coverage==5.5 +coverage==7.2.7 # via # -r tox.in # pytest-cov -cryptography==3.4.7 +cryptography==41.0.2 # via autobahn hyperlink==21.0.0 # via autobahn -idna==3.2 +idna==3.4 # via hyperlink -iniconfig==1.1.1 +iniconfig==2.0.0 # via pytest -packaging==21.0 +packaging==23.1 # via pytest -pluggy==0.13.1 +pluggy==1.2.0 # via pytest -py==1.10.0 +py==1.11.0 # via pytest -pycparser==2.20 +pycparser==2.21 # via cffi -pyparsing==2.4.7 - # via packaging -pytest==6.2.4 +pytest==6.2.5 # via # -r tox.in # pytest-asyncio @@ -47,13 +44,13 @@ pytest-asyncio==0.15.1 # via -r tox.in pytest-cov==2.12.1 # via -r tox.in -pytest-django==4.4.0 +pytest-django==4.5.2 # via -r tox.in -pytest-pythonpath==0.7.3 +pytest-pythonpath==0.7.4 # via -r tox.in toml==0.10.2 # via # pytest # pytest-cov -txaio==21.2.1 +txaio==23.1.1 # via autobahn From 286c50591256f9eb2426d05706b72e0a4b08b01b Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Thu, 27 Jul 2023 15:08:14 +0200 Subject: [PATCH 09/15] Removed tox-factor and deprecated Python 3.7 tests --- .github/workflows/tests.yml | 8 +++----- setup.py | 1 - tox.ini | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5cbf8d2..7c6e32f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.7, 3.8, 3.9] + python-version: [3.8, 3.9] steps: - uses: actions/checkout@v2 @@ -21,14 +21,12 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install "tox<4" tox-factor coverage + pip install tox coverage - name: Lint with flake8 run: tox -e flake8 if: matrix.python-version == '3.8' - name: Run tests via tox - run: | - export TOXFACTOR=$(echo "py${{ matrix.python-version }}" | sed 's/\.//g') - tox + run: tox -f $(echo "py${{ matrix.python-version }}" | sed 's/\.//g') - name: Generate coverage report run: coverage xml if: ${{ success() }} diff --git a/setup.py b/setup.py index 2afe940..8607686 100755 --- a/setup.py +++ b/setup.py @@ -76,7 +76,6 @@ def command_factory(name, base_class): Operating System :: OS Independent Programming Language :: JavaScript Programming Language :: Python -Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Topic :: Internet diff --git a/tox.ini b/tox.ini index 6395d3a..03d3162 100755 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = flake8 - py{37,38,39}-django{30,31,32} + py{38,39}-django{30,31,32} skipsdist = true #skip_missing_interpreters=true From bf270c0bc59baeba21c99b69d50d2f0973887459 Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Thu, 27 Jul 2023 15:08:50 +0200 Subject: [PATCH 10/15] Code cleanup --- requirements/dev.txt | 2 -- requirements/tox.txt | 2 -- 2 files changed, 4 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 52a31fc..98afaef 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,8 +4,6 @@ # # pip-compile dev.in # ---index-url https://devpi.cmn.prd.rheinwerk.de/rheinwerk/dev ---trusted-host devpi.cmn.prd.rheinwerk.de alabaster==0.7.13 # via sphinx diff --git a/requirements/tox.txt b/requirements/tox.txt index cf4b81a..e2fe2a5 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -4,8 +4,6 @@ # # pip-compile tox.in # ---index-url https://devpi.cmn.prd.rheinwerk.de/rheinwerk/dev ---trusted-host devpi.cmn.prd.rheinwerk.de attrs==23.1.0 # via pytest From 7bbad0938fd291f194da0b2568a39527323a9657 Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Thu, 27 Jul 2023 15:12:46 +0200 Subject: [PATCH 11/15] Added workaround for daphne import --- tests/conftest.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/conftest.py b/tests/conftest.py index 40a96af..0425d38 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1 +1,5 @@ # -*- coding: utf-8 -*- +import sys +from unittest.mock import MagicMock + +sys.modules['channels.testing.live'] = MagicMock() From 177feb5c978efa3883bc21e7048c18d93f6d118b Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Thu, 27 Jul 2023 15:21:42 +0200 Subject: [PATCH 12/15] Requirement cleanup --- requirements/dev.txt | 2 +- requirements/tox.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 98afaef..24d273d 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with python 3.8 # To update, run: # -# pip-compile dev.in +# pip-compile --output-file=dev.txt dev.in # alabaster==0.7.13 diff --git a/requirements/tox.txt b/requirements/tox.txt index e2fe2a5..a9d514f 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with python 3.8 # To update, run: # -# pip-compile tox.in +# pip-compile --output-file=tox.txt tox.in # attrs==23.1.0 From 4a3579688f494eb5f428ee8e6cc5ca8c134cbd9b Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Thu, 27 Jul 2023 15:52:02 +0200 Subject: [PATCH 13/15] Removed workaround for daphne import --- tests/conftest.py | 4 ---- tox.ini | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 0425d38..40a96af 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,5 +1 @@ # -*- coding: utf-8 -*- -import sys -from unittest.mock import MagicMock - -sys.modules['channels.testing.live'] = MagicMock() diff --git a/tox.ini b/tox.ini index 03d3162..4cb1ba0 100755 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ deps = django30: Django>=3.0,<3.1 django31: Django>=3.1,<3.2 django32: Django>=3.2,<4 - channels + channels<4 django-channels-presence -r{toxinidir}/requirements/tox.txt commands = From 033e117eab87256e3c4503db06e09e4ec50a107c Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Fri, 28 Jul 2023 08:20:49 +0200 Subject: [PATCH 14/15] Removed fixed channels version from the requirements --- requirements/dev.in | 2 +- requirements/dev.txt | 6 +++--- tox.ini | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/dev.in b/requirements/dev.in index 22b5d7d..89742d7 100755 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -1,7 +1,7 @@ -r tox.in asgiref<3.4.0 -channels==3.0.4 +channels Django>=3.2,<4 django-channels-presence flake8 diff --git a/requirements/dev.txt b/requirements/dev.txt index 24d273d..6fedb36 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # pip-compile --output-file=dev.txt dev.in # @@ -226,7 +226,7 @@ wrapt==1.15.0 # via astroid zipp==3.16.2 # via importlib-metadata -zope.interface==6.0 +zope-interface==6.0 # via twisted # The following packages are considered to be unsafe in a requirements file: diff --git a/tox.ini b/tox.ini index 4cb1ba0..03d3162 100755 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ deps = django30: Django>=3.0,<3.1 django31: Django>=3.1,<3.2 django32: Django>=3.2,<4 - channels<4 + channels django-channels-presence -r{toxinidir}/requirements/tox.txt commands = From cd9fa1c3e0398de2f2d50e66cc492a6fc81b7b30 Mon Sep 17 00:00:00 2001 From: Henning Kage Date: Fri, 28 Jul 2023 08:34:48 +0200 Subject: [PATCH 15/15] Pinned channels to <4 --- requirements/dev.in | 2 +- requirements/dev.txt | 2 +- requirements/tox.txt | 4 ++-- tox.ini | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/dev.in b/requirements/dev.in index 89742d7..2cac558 100755 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -1,7 +1,7 @@ -r tox.in asgiref<3.4.0 -channels +channels>=3,<4 Django>=3.2,<4 django-channels-presence flake8 diff --git a/requirements/dev.txt b/requirements/dev.txt index 6fedb36..047c4c2 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -207,7 +207,7 @@ tomli==2.0.1 # pip-tools # pylint # pyproject-hooks -tomlkit==0.12.0 +tomlkit==0.12.1 # via pylint twisted[tls]==22.10.0 # via daphne diff --git a/requirements/tox.txt b/requirements/tox.txt index a9d514f..d21a091 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # pip-compile --output-file=tox.txt tox.in # diff --git a/tox.ini b/tox.ini index 03d3162..4cb1ba0 100755 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ deps = django30: Django>=3.0,<3.1 django31: Django>=3.1,<3.2 django32: Django>=3.2,<4 - channels + channels<4 django-channels-presence -r{toxinidir}/requirements/tox.txt commands =