Merge pull request #38 from py-pkgs/codecov-file-path-fix

fix: remove hard-coded pycounts name in CI/CD files

Author: TomasBeuzen

cookiecutter.json

@@ -17,6 +17,6 @@
   "include_github_actions": [
     "no",
     "ci",
-    "cd"
+    "ci+cd"
   ]
 }

tests/test_cookiecutter.py

@@ -44,13 +44,13 @@ def test_cookiecutter_all_options(
     assert num_items(path, ["docs"]) == 9
     print(f"Checking pair: {open_source_license}, {include_github_actions}")
     if open_source_license == "None":
-        if include_github_actions in ["ci", "cd"]:
+        if include_github_actions in ["ci", "ci+cd"]:
             assert num_items(path, [".github", "workflows"]) == 1
             assert num_items(path) == 11
         else:
             assert num_items(path) == 10
     else:
-        if include_github_actions in ["ci", "cd"]:
+        if include_github_actions in ["ci", "ci+cd"]:
             assert num_items(path, [".github", "workflows"]) == 1
             assert num_items(path) == 12
         else:

{{cookiecutter.package_name}}/.github/workflows/ci-cd.yml

@@ -21,16 +21,16 @@ jobs:
     - uses: actions/checkout@v2
     # Step 4. Install poetry
     - uses: snok/install-poetry@v1
-    # Step 5. Install our pycounts package
+    # Step 5. Install our package
     - name: Install package
       run: poetry install
-    # Step 6. Run tests for pycounts
+    # Step 6. Run tests for package
     - name: Test with pytest
-      run: poetry run pytest tests/ --cov=pycounts --cov-report=xml
+      run: poetry run pytest tests/ --cov={{ cookiecutter.package_name }} --cov-report=xml
     # Step 7. Use Codecov to track coverage
     - uses: codecov/codecov-action@v2
       with:
-        file: ./coverage.xml    # coverage report
+        files: ./coverage.xml   # coverage report
         fail_ci_if_error: true  # terminate workflow if there's an error
     # Step 8. Build documentation
     - name: Build documentation
@@ -71,7 +71,7 @@ jobs:
           pip install \
           --index-url https://test.pypi.org/simple/ \
           --extra-index-url https://pypi.org/simple \
-          pycounts
+          {{ cookiecutter.package_name }}
     # Step 7. Publish to PyPI
     - uses: pypa/gh-action-pypi-publish@release/v1
       with:

{{cookiecutter.package_name}}/.github/workflows/ci.yml

@@ -21,16 +21,16 @@ jobs:
     - uses: actions/checkout@v2
     # Step 4. Install poetry
     - uses: snok/install-poetry@v1
-    # Step 5. Install our pycounts package
+    # Step 5. Install our package
     - name: Install package
       run: poetry install
-    # Step 6. Run tests for pycounts
+    # Step 6. Run tests for package
     - name: Test with pytest
-      run: poetry run pytest tests/ --cov=pycounts --cov-report=xml
+      run: poetry run pytest tests/ --cov={{ cookiecutter.package_name }} --cov-report=xml
     # Step 7. Use Codecov to track coverage
     - uses: codecov/codecov-action@v2
       with:
-        file: ./coverage.xml    # coverage report
+        files: ./coverage.xml   # coverage report
         fail_ci_if_error: true  # terminate workflow if there's an error
     # Step 8. Build documentation
     - name: Build documentation