Merge pull request #12 from apilytics/simplify-cd

Simplify CD pipeline, get rid of EndBug/add-and-commit action

Author: ruohola

.github/workflows/cd.yml

@@ -34,42 +34,42 @@ jobs:
           virtualenvs-create: true
           virtualenvs-in-project: true
 
-      - name: "Bump pyproject.toml to new version"
+      - name: "Bump pyproject.toml version"
         id: bump
         run: |
           poetry version ${{ github.event.inputs.release-type }}
           echo "::set-output name=version::$(poetry version --short)"
 
-      - name: "Bump apilytics.__version__ to new version"
+      - name: "Bump `apilytics.__version__`"
         run: sed -i 's/^__version__ *=.*/__version__ = "${{ steps.bump.outputs.version }}"/' apilytics/__init__.py
 
-      - name: "Build the wheel"
-        run: poetry build
-
-      - name: "Publish to PyPI"
-        run: poetry publish
-        env:
-          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
-
       - name: "Update the changelog"
         # Find the first line that starts with `###` or `## [<number>` from the CHANGELOG and insert the new version header before it.
-        run: |
-          current_date="$(date -u '+%Y-%m-%d')"
-          sed -i "0,/^\(###\|## *\[[0-9]\).*/{s//## [${{ steps.bump.outputs.version }}] - ${current_date}\n\n&/}" CHANGELOG.md
+        run: sed -i "0,/^\(###\|## *\[[0-9]\).*/{s//## [${{ steps.bump.outputs.version }}] - $(date -u '+%Y-%m-%d')\n\n&/}" CHANGELOG.md
 
       - name: "Extract version's changelog for release notes"
         # 1. Find the lines between the first `## [<number>` and the second `## [<number>`.
         # 2. Remove all leading and trailing newlines from the output.
         run: sed '1,/^## *\[[0-9]/d;/^## *\[[0-9]/Q' CHANGELOG.md | sed -e :a -e '/./,$!d;/^\n*$/{$d;N;};/\n$/ba' > release_notes.txt
 
       - name: "Commit and tag the changes"
-        uses: EndBug/add-and-commit@8c12ff729a98cfbcd3fe38b49f55eceb98a5ec02  # v7.5.0
-        with:
-          add: '["pyproject.toml", "apilytics/__init__.py", "CHANGELOG.md"]'
-          message: 'Release ${{ steps.bump.outputs.version }}'
-          tag: 'v${{ steps.bump.outputs.version }} --annotate --file /dev/null'
-          default_author: github_actions
-          pathspec_error_handling: exitImmediately
+        run: |
+          git config user.name 'github-actions'
+          git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
+          git add pyproject.toml apilytics/__init__.py CHANGELOG.md
+          git commit --message='Release ${{ steps.bump.outputs.version }}'
+          git tag --annotate --message='' v${{ steps.bump.outputs.version }}
+
+      - name: "Build the wheel"
+        run: poetry build
+
+      - name: "Publish to PyPI"
+        run: poetry publish
+        env:
+          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
+
+      - name: "Push the changes"
+        run: git push --follow-tags
 
       - name: "Create a GitHub release"
         uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5  # v1

apilytics/core.py

@@ -117,7 +117,7 @@ def set_response_info(
         Args:
             status_code: Status code for the HTTP response. Can be omitted (or None)
                 if the middleware could not get the status code.
-            response_size: Size of the body of the sent HTTP response in bytes.
+            response_size: Size of the sent HTTP response's body in bytes.
         """
         self._status_code = status_code
         self._response_size = response_size