diff --git a/.github/contributors.json b/.github/contributors.json index 5bd4ca459..393a9a4cc 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1237,5 +1237,10 @@ "name": "Ryan Fitch", "github_login": "ryfi", "twitter_username": "" + }, + { + "name": "ghazi-git", + "github_login": "ghazi-git", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f60cd9bf..29b66f2a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.02.13 + +### Changed +- Change docs port from 7000 to 9000 ([#3590](https://github.com/cookiecutter/cookiecutter-django/pull/3590)) + +## 2022.02.12 + +### Updated +- Update pytest to 7.0.1 ([#3588](https://github.com/cookiecutter/cookiecutter-django/pull/3588)) + +## 2022.02.11 + +### Updated +- Update sentry-sdk to 1.5.5 ([#3586](https://github.com/cookiecutter/cookiecutter-django/pull/3586)) + ## 2022.02.10 ### Fixed diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 9bc476a5d..4cd8f513a 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -768,6 +768,13 @@ Listed in alphabetical order. + + ghazi-git + + ghazi-git + + + Gilbishkosma diff --git a/docs/document.rst b/docs/document.rst index a30979094..974c66c69 100644 --- a/docs/document.rst +++ b/docs/document.rst @@ -13,7 +13,7 @@ If you set up your project to `develop locally with docker`_, run the following $ docker-compose -f local.yml up docs -Navigate to port 7000 on your host to see the documentation. This will be opened automatically at `localhost`_ for local, non-docker development. +Navigate to port 9000 on your host to see the documentation. This will be opened automatically at `localhost`_ for local, non-docker development. Note: using Docker for documentation sets up a temporary SQLite file by setting the environment variable ``DATABASE_URL=sqlite:///readthedocs.db`` in ``docs/conf.py`` to avoid a dependency on PostgreSQL. @@ -36,7 +36,7 @@ To setup your documentation on `ReadTheDocs`_, you must Additionally, you can auto-build Pull Request previews, but `you must enable it`_. -.. _localhost: http://localhost:7000/ +.. _localhost: http://localhost:9000/ .. _Sphinx: https://www.sphinx-doc.org/en/master/index.html .. _develop locally: ./developing-locally.html .. _develop locally with docker: ./developing-locally-docker.html diff --git a/requirements.txt b/requirements.txt index 7dbf72254..baebe15dd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==2.17.0 # Testing # ------------------------------------------------------------------------------ tox==3.24.5 -pytest==7.0.0 +pytest==7.0.1 pytest-cookies==0.6.1 pytest-instafail==0.4.2 pyyaml==6.0 diff --git a/setup.py b/setup.py index a9f4982d3..e8faeabc6 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.02.10" +version = "2022.02.13" with open("README.rst") as readme_file: long_description = readme_file.read() diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 488da14bd..10c53fdef 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -352,7 +352,7 @@ SPECTACULAR_SETTINGS = { "VERSION": "1.0.0", "SERVE_PERMISSIONS": ["rest_framework.permissions.IsAdminUser"], "SERVERS": [ - {"url": "https://127.0.0.1:8000", "description": "Local Development server"}, + {"url": "http://127.0.0.1:8000", "description": "Local Development server"}, {"url": "https://{{ cookiecutter.domain_name }}", "description": "Production server"}, ], } diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile index 0c4f9f574..cf080e476 100644 --- a/{{cookiecutter.project_slug}}/docs/Makefile +++ b/{{cookiecutter.project_slug}}/docs/Makefile @@ -3,7 +3,7 @@ # You can set these variables from the command line, and also # from the environment for the first two. -SPHINXOPTS ?= +SPHINXOPTS ?= SPHINXBUILD ?= sphinx-build SOURCEDIR = . BUILDDIR = ./_build @@ -21,10 +21,10 @@ help: # Build, watch and serve docs with live reload livehtml: - sphinx-autobuild -b html + sphinx-autobuild -b html {%- if cookiecutter.use_docker == 'y' %} --host 0.0.0.0 - {%- else %} --open-browser - {%- endif %} --port 7000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html + {%- else %} --open-browser + {%- endif %} --port 9000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html # Outputs rst files from django application code apidocs: diff --git a/{{cookiecutter.project_slug}}/docs/make.bat b/{{cookiecutter.project_slug}}/docs/make.bat index b19f42c6a..6cd1129f0 100644 --- a/{{cookiecutter.project_slug}}/docs/make.bat +++ b/{{cookiecutter.project_slug}}/docs/make.bat @@ -32,7 +32,7 @@ if errorlevel 9009 ( goto end :livehtml -sphinx-autobuild -b html --open-browser -p 7000 --watch %APP% -c . %SOURCEDIR% %BUILDDIR%/html +sphinx-autobuild -b html --open-browser -p 9000 --watch %APP% -c . %SOURCEDIR% %BUILDDIR%/html GOTO :EOF :apidocs diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index 647562331..e602ecbd4 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -86,7 +86,7 @@ services: - ./config:/app/config:z - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}:z ports: - - "7000:7000" + - "9000:9000" command: /start-docs {%- if cookiecutter.use_mailhog == 'y' %} diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 3cd62ca6d..10b03dc5a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -20,7 +20,7 @@ watchgod==0.7 # https://github.com/samuelcolvin/watchgod # ------------------------------------------------------------------------------ mypy==0.931 # https://github.com/python/mypy django-stubs==1.9.0 # https://github.com/typeddjango/django-stubs -pytest==7.0.0 # https://github.com/pytest-dev/pytest +pytest==7.0.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs==1.4.0 # https://github.com/typeddjango/djangorestframework-stubs