Commit Graph

74 Commits

Author SHA1 Message Date
Bruno Alla
4e96b64261 Merge branch 'master' into fix_django_31
# Conflicts:
#	{{cookiecutter.project_slug}}/requirements/base.txt
2021-02-23 19:10:52 +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
areski
002b3eaf41 Update Django 3.0.11 to 3.1.6 2021-02-04 16:52:45 +01:00
Bruno Alla
5ad419e322 Fixes for pip 20.3 2020-12-02 13:58:05 +00:00
Bruno Alla
f7bba44015 Print commands in bash script 2020-10-04 15:57:37 +01:00
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
Bruno Alla
1645b8826d Use the pip resolver to avoid broken deps 2020-08-11 16:20:10 +01: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
Bruno Alla
52dc302c93 Better error reporting in case of flake8 or black error 2020-03-03 19:37:27 +00:00
Bruno Alla
33f210abc4 Simplify setup for the automated tests 2020-02-29 17:31:16 +00:00
Andrew-Chen-Wang
c839862aef Testing mail service does not raise KeyError
* KeyError raised when cloud_provider was used twice in mark parametrization.
* Tox isn't working properly for me (collecting 17,000 files; obviously neglecting tox.ini and/or pytest.ini)
2020-02-06 22:12:30 -05:00
Andrew-Chen-Wang
0df8cfdb90 Added mail service pytests in test_cookiecutter_generation.py 2020-02-06 21:03:49 -05:00
Bruno Alla
2f6cb4e8f6 Fix deprecation warning 2020-02-03 12:29:37 +00:00
Bruno Alla
2698867cf8 Typo 2020-01-28 10:33:24 +00:00
Bruno Alla
2833600aec Test generation with and without DRF 2020-01-23 14:43:17 +00:00
Ivan Khomutov
113ce88d9c Add option to choose CI tool 2019-12-06 10:55:00 +03:00
Bruno Alla
5750330ac2 Merge whitenoise & cloud provider parametrize in tests 2019-10-06 10:28:15 +01:00
Caio Ariede
4f8834c0eb
Update tests/test_cookiecutter_generation.py
Co-Authored-By: Bruno Alla <browniebroke@users.noreply.github.com>
2019-10-03 11:54:15 -03:00
Caio Ariede
9fffafc095 Add docstring 2019-10-02 12:06:53 -03:00
Caio Ariede
d0c208d10f Fix #2249 -- Broken static files with whitenoise=n & cloud_provider=none 2019-10-02 12:03:33 -03:00
Bruno Alla
aaf5d8d8f5 Run tests on bare metal
Install with Celery and compressor as it requires compilation

closes #1677
2019-06-18 21:02:37 +01:00
Bruno Alla
2103cf2f9d Add a pre-generation hook to avoid non-lowercase slugs - fixes #2042 2019-06-05 19:00:43 +01:00
Bruno Alla
47937fce79 Fix deprecation warning in tests 2019-05-27 16:54:08 +01:00
Tano Abeleyra
de7be3652a Make cloud_provider optional
Some projects may not need AWS or GCS
2019-05-19 12:45:28 -03:00
Bruno Alla
a245651f66 Increase test parallelism
- Split out tests and add markers to control where they are run in Travis
- Run each marker on a separate Travis task
- Install pytest-xdist to increase parallelism inside each worker
- Set xdist parallelism to 3
2019-05-15 12:37:17 +01:00
anuj
b5e030b784 Corrected quotes, added parameter in tests 2019-04-07 00:34:22 +05:30
Bruno Alla
1d420157c1 Revert accidental commit 2019-04-02 15:10:14 +01:00
Bruno Alla
6d48275e5f Fix Heroku docs 2019-04-02 10:33:38 +01:00
Bruno Alla
4e70a4b55a
Test all possible template combinations (#1993)
## Description

Fixes #591.

## Rationale

We are currently not testing many combinations, we run Flake8 on the generated project with default options, but that rarely catch any issues.

## Use case(s) / visualization(s)

Catch problems with invalid combinations, for instance, it fails due to Whitenoise breaking flake8 with `django-compressor` because `STATIC_URL` was undefined here:

b91c70d755/%7B%7Bcookiecutter.project_slug%7D%7D/config/settings/production.py (L185)
2019-04-01 08:47:46 +01:00
Bruno Alla
68f7268770
Run Black on Travis (#1957)
* Create a test matrix on Travis CI to help testing multiple options

* Change test_docker.sh to fail if any command in it fails

* Run black on the CI with --check option

* Fix formatting of project files using black

* Install black in the docker container

* Exclude migrations in black checks

* Fix Black formatting violations

* Run black on the whole generated project & fix issues
2019-03-18 17:49:43 +00:00
btknu
6e72169ffe Add missing script key to Travis CI config (#1950)
* Add failing test for travis.yml

I see three options to test travis.yml :

1. Testing that the YAML contains relevant value. Least useful and least
reliable, but simplest to implement.

2. Testing that the YAML is valid TravisCI YAML. Unfortunately this is
difficult / impossible. Doing 'travis lint' would succeed, this command
does not check for 'script' key presence and wouldn't be useful for us.

We could use 'travis-build' to verify that the YAML can be converted to
a worker config, but as of now 'travis-build' doesn't work out of the
box.

There is a new tool for validating travis YAML files 'travis-yml', but
as of now it's a ruby-only library and it's still a work in progress.

3. Running Travis CI task based on the generated YAML. This seems the
best approach, however since cookiecutter-django itself uses Travis CI,
that would require running Travis CI from within Travis CI.

Scheduling Travis CI job without a github push still requires a public
github repo, which is something that we can't generate on demand.

Given that I'm opting to use approach 1.

* Adds missing config to generated .travis.yml

The keys added are as follows:

1. 'script'

Required by Travis, cookiecutter-django used to provide it until it has
been removed together with hitch.

I'm assuming hitch has been replaced with pytest, I'm setting pytest as
the new value for the 'script' key.

2. 'install'

Not required by Travis, but necessary in our case; installs test
libraries, mostly pytest.

As of now this points to 'local.txt' requirements file. There used to be
a separate 'test.txt' requirements file but it has been decided to merge
it with 'local.txt', see discussion in
https://github.com/pydanny/cookiecutter-django/pull/1557 .

* Update CONTRIBUTORS.rst
2019-03-05 22:10:45 -03:00
Bruno Alla
b5d782e252
Merge branch 'master' into mypy 2018-08-29 08:21:22 +01:00
Denis Orehovsky
80e0862ff0 Fix running tests in test_docker.sh file 2018-08-19 14:22:33 +03:00
Denis Orehovsky
c18a2fca8c Run type checks in test_docker 2018-08-19 14:08:29 +03:00
John Cass
bb01d961ed Use pytest's recommended command as the entry point for running tests. 2018-07-23 08:51:06 +02:00
Nikita P. Shupeyko
de56ad9099 Remove redundant js_task_runner declaration from test_docker.sh 2018-05-21 21:37:42 +03:00
Daniel Roy Greenfeld
3f753e0411
First pass at running black across the project (#1602) 2018-04-08 17:03:29 -05:00