Commit Graph

82 Commits

Author SHA1 Message Date
Jelmer Draaijer
0fc4ea6165 Apply ruff to codebase 2024-02-13 11:59:55 +01:00
Vageeshan Mankala
73137e1764
Replace Mailhog with Mailpit (#4551)
* modifying cookiecutter.json with new config

* updated docker image and its local settings

* replacing  use_mailhog conditions

* replacing use_mailhog condition in docs

* Updating docs with mailpit
2023-09-06 20:41:01 +01:00
Shayan Karimi
40ddc4b6af
Add support for Drone (#4382)
* Add overall config for drone.io support

* Update docs

* Configure basic CI setup

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix python image version for tests step

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2023-07-28 13:03:47 +01:00
Imran Rahman
f567b5f685
update docs docker-compose -> docker compose (#4463)
Co-authored-by: Imran Rahman <imranrahman.ix@gmail.com>
2023-07-24 10:42:51 +01:00
Joseph Hanna
d604fd7db1
Add Postgresql 15 (#4431)
* Add Postgresql 15

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2023-07-04 21:14:28 +01:00
masavini
1ed6d6e03b
VS Code Dev Container (#4198)
* decontainer setup

* update

* fix typo

* keep .envs

* add info

* typo

* minor fixes

* keep compose/production

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add isort and lint

* choose editor and configure devcontainer

* choose editor and configure devcontainer

* add ssh client

* Remove isort arguments duplicated with base config

* End of file

* Only keep black as code formatter

* Add note about black not being accepted as formatter in devcontainer

* Avoid empty lines in devcontainer.json

* Move bash_history into .devcontainer folder

* Remove .prettierignore file

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
2023-07-03 11:55:33 +02:00
Jelmer
6f34e19260
Merge pull request #4393 from foarsitter/django-4.2
Upgrade to django 4.2
2023-06-28 08:58:24 +02:00
Jelmer Draaijer
ef36732569 Set target-version for django upgrade to 4.2 2023-06-28 08:38:04 +02:00
monosans
30e8506872
Add djLint for HTML formatting and linting (#4389)
* Add djLint for HTML formatting and linting

* Remove djLint pre-commit hook

* Bump djLint from 1.31.0 to 1.31.1
2023-06-27 22:52:36 +01:00
Bruno Alla
c88f8ef37a
Add django-upgrade to pre-commit hooks (#4298) 2023-04-28 08:56:22 +01:00
Bruno Alla
17fa459dc3
Fix inconsistent line length and move configs to pyproject.toml (#4276)
* Fix inconsistent line length and move config to pyproject.toml

Fix #2720

* Fix running tox with AUTOFIXABLE_STYLES

* Adjust some styles

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Adjust more styles

* Split isort and flake8 tests

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2023-04-15 15:43:04 +01:00
Bruno Alla
550f270b70
Relax rules for linting of pull requests on this template (#4273)
* Don't check for black or pre-commit by default

Fix #4261

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Ignore CONTRIBUTORS.md when running template's pre-commit

* Fix condition for skipping tests

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2023-04-15 13:21:18 +01:00
Andrew Chen Wang
1783257ed3
Add username_type option (#3958)
* Add username_type option

* Update docs

Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>

* Fix errors and lint

Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>

* Try linting again

* Try linting again

* Handle signup

* Fix url reverse in template

* Fix migration file

* Remove extra line in factories

* E2E tests for email username

* Fix style in users api views and serializers

* Fix style in users api views and serializers

* Add conditions for fields in UserAdminCreationForm

* Consistent Jinja tag conditions

* Fix more empty lines issues

* Tweak options order

* Test username email

* Fix code style

* Fix kwargs to reverse user details view

* Remove comment in template

* Fix error messages dict in user form

* Fix line wrapping

* Move custom manager into a separate module and add tests

---------

Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
2023-04-15 11:53:15 +01:00
Hoai-Thu Vuong
dcea8f1e7b
Trim leading and trailing space in domain_name and email (#4163)
* remove trailing space in domain_name and email

* Add test for leading and trailing spaces removals

* Move magic string and add a comment explaining its role

---------

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
2023-03-16 17:17:02 +00:00
Bruno Alla
eeb02c2198
Run linting with pre-commit on GitLab (#4150)
* Run linting with pre-commit on GitLab

* Update tests
2023-02-25 12:33:30 +00:00
Bruno Alla
cbb0e19de7
Add Webpack support (#3623)
* Add support for Webpack as frontend pipeline

* Rename CI jobs

* Fix a couple of issues with Webpack + Docker

* Don't include Boostrap CSS from CDN with Webpack

* Rename variable

* Set publicPath in prod webpack config

* Fix removal of SASS files in post-gen hooks

* Add Webpack to readme usage section

* Run Django + Webpack dev server concurrently without Docker

* Fix async runserver command with Gulp/Webpack

* Upgrade django-webpack-loader to 1.5.0

* Pass variables required by Webpack at build time

* Upgrade django-webpack-loader to 1.7.0

* Add missing condition

* Add support for Azure Storage + Webpack

* Whitespaces

* Rename ROOT_DIR -> BASE_DIR

* Rename jobs

* Bump django-webpack-loader to latest

* Document limitation of Docker + Webpack + no Whitenoise

* Update section on custom Bootstrap compilation in generated readme
2023-01-29 12:12:12 +00:00
tildebox
70014c2b45
Rename ROOT_DIR to BASE_DIR (#4086)
Co-authored-by: example <example@example.com>
Fix https://github.com/cookiecutter/cookiecutter-django/issues/4075
2023-01-25 22:55:08 +00:00
rguptar
49b3bb8ffe
Add Azure Storage as an option to serve static and media files (#3967)
Fix https://github.com/cookiecutter/cookiecutter-django/issues/2301
2022-11-30 18:26:58 +00:00
pyup.io bot
a51c8d2961
Update cookiecutter to 2.1.1 (#3727)
* Update cookiecutter from 1.7.3 to 2.1.1

* Fix postgreSQL versions in tests

* Fix front-end pipeline choice in tests

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
2022-06-13 20:17:46 +01:00
Bruno Alla
96b9b95af7
Add pyupgrade to pre-commit config (#3702)
* Add pyupgrade to pre-commit config

* Exclude hooks folder from pyupgrade

* Autofix: run pyupgrade

* Autofix: run pyupgrade on template files
2022-05-07 19:21:15 +01:00
Bruno Alla
ab4a32d558
Unify compressor, gulp and custom bootstrap options (#3535) 2022-03-20 15:00:40 +00:00
pyup.io bot
aafa66bf7c
Update pytest to 7.0.0 (#3567)
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
2022-02-07 17:19:52 +00:00
Bruno Alla
150e1d8bed
Update black to 22.1.0 (#3572)
Co-authored-by: pyup-bot <github-bot@pyup.io>
2022-02-07 15:40:53 +00:00
Bruno Alla
2186caf11d
Speed up CI tests on macOS (#3480) 2021-12-22 08:14:00 +00:00
Bruno Alla
ce1c76e34e
Fix carriage return in .gitignore on Windows (#3456) 2021-12-16 11:07:47 +00:00
Bruno Alla
407a7d8bbc
Setup pre-commit for the template files (#3433) 2021-11-26 15:41:50 +00:00
mpoli
145d65aeff
Bump Postgres to 13.5 12.9 11.14 10.19; add 14.1 (#3428) 2021-11-22 09:26:46 +00:00
Bruno Alla
57f9ff571b
Merge pull request #3139 from fhightower/patch-1
Removing pycharm docs if app does not use pycharm
2021-09-11 17:55:10 +01:00
Bruno Alla
b7de132d31
Compare boolean with is instead of equality 2021-09-11 17:48:47 +01:00
Bruno Alla
25820cab7d
Merge pull request #3154 from Andrew-Chen-Wang/new-pg 2021-06-22 10:00:22 +01:00
Andrew-Chen-Wang
405e262322 Update PG versions. Drop PG 9
Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>
2021-05-04 11:34:25 -04:00
Floyd Hightower
6f66b330e6 Running black on updated file 2021-04-27 05:41:00 -05:00
Floyd Hightower
6b5ad4e833 Adding test to validate pycharm docs are removed appropriately 2021-04-26 06:17:02 -05:00
Bruno Alla
a6e4555450 Update tests 2021-03-02 21:20:20 +00:00
Arnav Choudhury
fbc9b89e0d Updated tests with the updated github stage names. 2021-02-23 11:28:37 +05:30
Arnav Choudhury
db636c8e36 Updated tests with the updated github stage names. 2021-02-23 11:11:03 +05:30
Arnav Choudhury
b064e09f12
Adding GitHub-Action CI Option (#2837) 2020-09-21 11:20:24 +01:00
Bruno Alla
e21869c1d4 Fix black formatting issues 2020-08-27 09:41:28 +02:00
Andrew-Chen-Wang
4d5b6db4c1 Added PG 12.3; Dropped 9.4 2020-07-11 21:15:17 -04:00
Bruno Alla
d689197c2b Some minor refactorings in tests 2020-07-04 14:58:17 +01:00
Bruno Alla
6f88fe6b4f Reformat test file 2020-05-12 10:24:25 +01:00
Bruno Alla
81642420c4 Run flake8 from the generated project root
3.8.1 can't find the config if running from elsewhere:
https://gitlab.com/pycqa/flake8/-/issues/639
2020-05-12 10:14:34 +01:00
Bruno Alla
f01ff95c51
Merge pull request #2539 from Andrew-Chen-Wang/ci 2020-04-17 11:34:50 +01:00
Andrew-Chen-Wang
d2285d9e2d pytest.parametrized test for generating CI
* Removed celerybeat start's postgres_ready() for new PR for closer inspection and further review. Travis and GitLab CI reflect changes
2020-04-16 13:34:12 -04:00
Andrew-Chen-Wang
3c63b3e46e Add Docker support to Travis and GitLab CI
* Celerybeat start files wait for table migration so that errors don't occur if a migration does not happen post-build
2020-04-14 11:52:14 -04:00
Andrew-Chen-Wang
c4eaf68982 Fixed test_cookiecutter_generation.py for use_async from set to dict 2020-03-24 15:53:45 -04:00
Andrew-Chen-Wang
aee2de347b Add uvicorn and web sockets for Django 3
* Add use_async option to cookiecutter.json
* Add websocket configuration
2020-03-24 15:40:14 -04:00
Andrew-Chen-Wang
484fa4ae77 Added unsupported mail_service combinations
* Added default yaml Loader for pre_gen_projects.py
2020-03-22 13:31:52 -04:00
Andrew-Chen-Wang
5e1d1dd1c3 Fixed tests for mail providers 2020-03-14 15:09:05 -04:00
Andrew-Chen-Wang
9cf72849e6 Merged parent repo and configured refurbished tests 2020-03-14 13:29:08 -04:00