Merge pull request #34 from Rainist/feature/makefile

Makefile, travis 개선

.travis.yml

@@ -2,8 +2,7 @@ sudo: required
 
 language: python
 
-dist:
-  - xenial
+dist: xenial
 
 python:
   - "3.7"

tests/test_makefile.py

@@ -26,4 +26,35 @@ def test_makefile_total_lines(cookies, context, black, pipenv, mypy):
     expected = 27
     expected -= 2 if black == 'n' else 0
     expected -= 1 if mypy == 'do not use' else 0
+    expected += 4 if pipenv == 'y' else 0
     assert len(lines) == expected
+
+
+@pytest.mark.parametrize('black', ['y', 'n'])
+@pytest.mark.parametrize('pipenv', ['y', 'n'])
+@pytest.mark.parametrize('mypy', ['do not use', 'beginner', 'expert'])
+def test_makefile_total_section(cookies, context, black, pipenv, mypy):
+    ctx = context(black=black, pipenv=pipenv, mypy=mypy)
+    result = cookies.bake(extra_context=ctx)
+
+    makefile = result.project.join('Makefile')
+    content = makefile.read()
+    sections = content.strip().split('\n\n')
+
+    expected = 8
+    expected -= 1 if pipenv == 'n' else 0
+    assert len(sections) == expected
+
+
+@pytest.mark.parametrize('pipenv', ['y', 'n'])
+def test_makefile_phony(cookies, context, pipenv):
+    ctx = context(pipenv=pipenv)
+    result = cookies.bake(extra_context=ctx)
+
+    makefile = result.project.join('Makefile')
+    lines = makefile.readlines()
+    phony = lines[0]
+
+    expected = 8
+    expected -= 1 if pipenv == 'n' else 0
+    assert len(phony.split(' ')) == expected

tests/test_travis.py

@@ -0,0 +1,43 @@
+import pytest
+
+
+@pytest.mark.parametrize('version', ['3.7', '3.6'])
+@pytest.mark.parametrize('pipenv', ['y', 'n'])
+def test_travis_total_lines(cookies, context, version, pipenv):
+    """
+    We expect .travis.yml has below content
+    ```
+    1 sudo: required
+    2
+    3 language: python
+    4
+    5 install:
+    6   - make
+    ```
+    """
+    ctx = context(version=version, pipenv=pipenv)
+    result = cookies.bake(extra_context=ctx)
+
+    makefile = result.project.join('.travis.yml')
+    lines = makefile.readlines(cr=False)
+
+    expected = 32
+    expected -= 2 if version == '3.6' else 0
+    expected -= 6 if pipenv == 'n' else 0
+    assert len(lines) == expected
+
+
+@pytest.mark.parametrize('version', ['3.7', '3.6'])
+@pytest.mark.parametrize('pipenv', ['y', 'n'])
+def test_travis_total_section(cookies, context, version, pipenv):
+    ctx = context(version=version, pipenv=pipenv)
+    result = cookies.bake(extra_context=ctx)
+
+    makefile = result.project.join('.travis.yml')
+    content = makefile.read()
+    sections = content.strip().split('\n\n')
+
+    expected = 10
+    expected -= 1 if version == '3.6' else 0
+    expected -= 1 if pipenv == 'n' else 0
+    assert len(sections) == expected

{{cookiecutter.project_slug}}/.travis.yml

@@ -4,8 +4,7 @@ language: python
 
 {%- if cookiecutter.python_version == "3.7" %}
 
-dist:
-  - xenial
+dist: xenial
 {%- endif %}
 
 python:
@@ -30,7 +29,6 @@ install:
   - make
 
 script:
-
 {%- if cookiecutter.use_pipenv|lower != 'n' %}
   - pipenv run make check
   - pipenv run make test
@@ -40,4 +38,9 @@ script:
 {%- endif %}
 
 after_success:
+{%- if cookiecutter.use_pipenv|lower != 'n' %}
+  - pipenv run make coverage
+{%- else %}
+  - make coverage
+{%- endif %}
   - bash < (curl -s https://codecov.io/bash)

{{cookiecutter.project_slug}}/Makefile

@@ -1,4 +1,4 @@
-.PHONY: init check format test coverage htmlcov
+.PHONY: init check format test coverage htmlcov{% if cookiecutter.use_pipenv|lower != 'n' %} requirements{% endif %}
 
 init:
 {%- if cookiecutter.use_pipenv|lower != 'n' %}
@@ -29,9 +29,16 @@ test:
 	python -m pytest
 
 coverage:
-	python -m pytest --cov {{ cookiecutter.package_name }} --cov-report term
+	python -m pytest --cov {{ cookiecutter.package_name }} --cov-report term --cov-report xml
 
 htmlcov:
 	python -m pytest --cov {{ cookiecutter.package_name }} --cov-report html
 	rm -rf /tmp/htmlcov && mv htmlcov /tmp/
 	open /tmp/htmlcov/index.html
+
+{%- if cookiecutter.use_pipenv|lower != 'n' %}
+
+requirements:
+	pipenv lock -r > requirements.txt
+	pipenv lock -dr > requirements-dev.txt
+{%- endif %}

{{cookiecutter.project_slug}}/Pipfile

@@ -4,16 +4,16 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
-isort = "*"
+isort = "4.3.20"
 {%- if cookiecutter.use_black|lower != 'n' %}
 black = "==19.3b0"
 {%- endif %}
-pylint = "*"
+pylint = "2.3.1"
 {%- if cookiecutter.use_mypy|lower != 'do not use' %}
-mypy = "*"
+mypy = "0.701"
 {%- endif %}
-pytest = "*"
-pytest-cov = "*"
+pytest = "4.6.3"
+pytest-cov = "2.7.1"
 
 [packages]