From 53119d91eb5b78a641c5c0c2fb91b0458d854cfa Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 12 Feb 2022 02:19:08 +0000 Subject: [PATCH 1/7] Release 2022.02.11 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f60cd9bf..954bfe184 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 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/setup.py b/setup.py index a9f4982d3..e75aaea77 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.11" with open("README.rst") as readme_file: long_description = readme_file.read() From 83c05858fd410f4d5688b6e4460a6edd9f1efa9d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 12 Feb 2022 06:56:45 -0500 Subject: [PATCH 2/7] Update pytest to 7.0.1 (#3588) * Update pytest from 7.0.0 to 7.0.1 * Update pytest from 7.0.0 to 7.0.1 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 0183a1fcb..09eedbdc1 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,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 From 1d46454ee016c5b987abf68e3a3cb749a0083bac Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 13 Feb 2022 02:16:55 +0000 Subject: [PATCH 3/7] Release 2022.02.12 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 954bfe184..06e2ce176 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.02.12 + +### Updated +- Update pytest to 7.0.1 ([#3588](https://github.com/cookiecutter/cookiecutter-django/pull/3588)) + ## 2022.02.11 ### Updated diff --git a/setup.py b/setup.py index e75aaea77..b70752941 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.11" +version = "2022.02.12" with open("README.rst") as readme_file: long_description = readme_file.read() From 85ee3c921a18c40e655dbdf15c2792e6740e5f50 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Sun, 13 Feb 2022 07:49:05 -0500 Subject: [PATCH 4/7] Change docs port to 9000 from 7000 (#3590) Signed-off-by: Andrew-Chen-Wang --- docs/document.rst | 4 ++-- {{cookiecutter.project_slug}}/docs/Makefile | 8 ++++---- {{cookiecutter.project_slug}}/docs/make.bat | 2 +- {{cookiecutter.project_slug}}/local.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) 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/{{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 78e390a81..590445820 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -55,7 +55,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' %} From 61be357ded79a050abf22a966175869242e9a532 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 14 Feb 2022 02:12:49 +0000 Subject: [PATCH 5/7] Release 2022.02.13 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06e2ce176..29b66f2a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ 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 diff --git a/setup.py b/setup.py index b70752941..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.12" +version = "2022.02.13" with open("README.rst") as readme_file: long_description = readme_file.read() From ca5411af9ab6dc171e779c32bce5392cbee952da Mon Sep 17 00:00:00 2001 From: ghazi-git Date: Tue, 15 Feb 2022 15:52:20 +0100 Subject: [PATCH 6/7] fix typo in servers settings for drf-spectacular update the local dev server url to use http instead of https --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 816ae7c2a..ef3dfb9c0 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -346,7 +346,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"}, ], } From abbbfea550d3c9f7261ec695541b2212be8be881 Mon Sep 17 00:00:00 2001 From: luzfcb Date: Tue, 15 Feb 2022 16:35:19 +0000 Subject: [PATCH 7/7] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) 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/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