⚡ update dependencies and update ci/cd

Author: KochankovID

README.md

@@ -15,16 +15,12 @@ project with gitlab ci/cd included.
 
 > You need to set these variables in the repository settings.
 
-- **PAKAGE_REGISTRY** - url on package registry. Needed for package uploading
-  from ci/cd.
-  > You can take it from pyproject.toml after project generation
-  > _tool.semantic_release.repository_url_
-- **GL_TOKEN** - personal access token for GitLab. Needed for making version
+- **`GL_TOKEN`** - personal access token for GitLab. Needed for making version
   bumping commits from ci/cd.
-- **DEPLOY_TOKEN_NAME** - Name of the access token for package registry. Needed for package uploading
-  from ci/cd.
-- **DEPLOY_TOKEN** - The access token for package registry. Needed for package uploading
-  from ci/cd.
+- **`REPOSITORY_USERNAME`** - Name of the access token for package registry.
+  Needed for package uploading from ci/cd.
+- **`REPOSITORY_PASSWORD`** - The access token for package registry. Needed for
+  package uploading from ci/cd.
 
 ## 🧸 Summarise
 
@@ -36,21 +32,47 @@ project with gitlab ci/cd included.
 ## ✨ Features
 
 - [x] GitLab CI/CD
-- - [x] Linters (pre-commit)
-- - - [x] Trailing-whitespace
-- - - [x] Pyupgrade
-- - - [x] Prettier
-- - - [x] Isort
-- - - [x] Black
-- - - [x] Flake 8
-- - - [x] Mypy
-- - - [x] Pylint
-- - - [x] Docstring formatter
-- - - [x] Autoflake
-- - - [x] Poetry check
-- - [x] Tests
-- - [x] Release (tag version bumping)
-- - [ ] Documentation (TODO)
+-
+    - [x] Linters (pre-commit)
+-
+    -
+        - [x] Trailing-whitespace
+-
+    -
+        - [x] Pyupgrade
+-
+    -
+        - [x] Prettier
+-
+    -
+        - [x] Isort
+-
+    -
+        - [x] Black
+-
+    -
+        - [x] Flake 8
+-
+    -
+        - [x] Mypy
+-
+    -
+        - [x] Pylint
+-
+    -
+        - [x] Docstring formatter
+-
+    -
+        - [x] Autoflake
+-
+    -
+        - [x] Poetry check
+-
+    - [x] Tests
+-
+    - [x] Release (tag version bumping)
+-
+    - [ ] Documentation (TODO)
 - [x] Pre-commit hooks
 - [x] Readme
 - [x] Contributing

{{cookiecutter.package_name}}/.gitlab-ci.yml

@@ -2,8 +2,7 @@ stages:
   - lint # Check package with linters
   - test # Run test
   - test-build # Run test build
-  - deploy-version # Deploy and create version tag
-  - deploy-package # Deploy package
+  - deploy # Deploy new version of package to registry
 
 # Official language image. Look for the different tagged releases at:
 # https://hub.docker.com/r/library/python/tags/
@@ -14,8 +13,6 @@ variables:
   PIP_CACHE_DIR: $CI_PROJECT_DIR/.cache/pip # Set folder in working dir for cache
   PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit # Set folder in working dir for cache
   TOX_TESTENV_PASSENV: PIP_CACHE_DIR PRE_COMMIT_HOME # For cache the dependencies
-  BOT_NAME: "semantic-release <semantic-release>" # Name of the bot who make commits with version bump
-  RELEASE_BRANCH: "{{cookiecutter.release_branch}}" # Name of the branch where the release is made
 
 # Runs on 1) merge request in main branch
 #         2) commit in main branch
@@ -31,7 +28,7 @@ lint:
       - .tox
       - ${PRE_COMMIT_HOME}
   rules:
-    - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH) && $CI_COMMIT_AUTHOR != $BOT_NAME
+    - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)
 
 # Runs on 1) merge request in main branch
 #         2) commit in main branch
@@ -51,7 +48,7 @@ test:
       - .reports/py310-report.html
     expire_in: 1 week
   rules:
-    - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH) && $CI_COMMIT_AUTHOR != $BOT_NAME
+    - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)
 
 # Runs on 1) merge request in main branch
 #         2) commit in main branch
@@ -66,44 +63,27 @@ test-build:
     paths:
       - ${PIP_CACHE_DIR}
   rules:
-    - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH) && $CI_COMMIT_AUTHOR != $BOT_NAME
+    - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)
 
-# Runs on 1) commit not from bot in main branch (not runs on version bump)
-deploy-version:
+# Runs on 1) commit in main branch
+deploy:
   needs:
     - lint
     - test
     - test-build
   script:
     - echo "This is the deploy-version version stage"
+    - echo "Install poetry"
     - pip install poetry
-    - echo "Poetry installed"
+    - echo "Install python-semantic-release"
     - pip install python-semantic-release
-    - echo "Python-semantic-release installed"
+    - echo "Set semantic-release git credentials"
     - git config --global user.email "semantic-release@gmail.com"
     - git config --global user.name "semantic-release"
-    - echo "Set semantic-release git credentials"
-    - export GL_TOKEN && semantic-release publish
+    - semantic-release publish
     - echo "Publishing version done!"
   cache:
     paths:
       - ${PIP_CACHE_DIR}
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_AUTHOR != $BOT_NAME
-
-# Runs on 1) commit from bot in main branch (version bump)
-deploy-package:
-  script:
-    - echo "This is the build package stage"
-    - pip install poetry
-    - echo "Poetry installed"
-    - poetry build
-    - echo "The package was build"
-    - poetry config repositories.gitlab $PAKAGE_REGISTRY
-    - poetry publish --repository gitlab -u $DEPLOY_TOKEN_NAME -p $DEPLOY_TOKEN
-    - echo "Publishing package done!"
-  cache:
-    paths:
-      - ${PIP_CACHE_DIR}
-  rules:
-    - if: $CI_COMMIT_BRANCH == $RELEASE_BRANCH && $CI_COMMIT_AUTHOR == $BOT_NAME
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

{{cookiecutter.package_name}}/.pre-commit-config.yaml

@@ -1,19 +1,19 @@
 repos:
   # Trailing-whitespace
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.3.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   # Pyupgrade
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.32.1
+    rev: v3.2.2
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
   # Prettier
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.6.2
+    rev: v3.0.0-alpha.4
     hooks:
       - id: prettier
         args:
@@ -28,20 +28,20 @@ repos:
         name: isort (python)
   # Black
   - repo: https://github.com/psf/black.git
-    rev: 22.3.0
+    rev: 22.10.0
     hooks:
       - id: black
         name: black
   # Flake 8
   - repo: https://github.com/pycqa/flake8
-    rev: 4.0.1
+    rev: 5.0.4
     hooks:
       - id: flake8
         args:
           - --max-line-length=120
   # Mypy
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.960
+    rev: v0.991
     hooks:
       - id: mypy
         language_version: python
@@ -51,18 +51,18 @@ repos:
           - --ignore-missing-imports
   # Pylint
   - repo: https://github.com/pycqa/pylint
-    rev: v2.14.0-b1
+    rev: v2.15.6
     hooks:
       - id: pylint
         exclude: tests/functional/|tests/input|tests(/\w*)*data/|doc/
   # Docstring formatter
   - repo: https://github.com/DanielNoord/pydocstringformatter
-    rev: v0.6.0
+    rev: v0.7.2
     hooks:
       - id: pydocstringformatter
   # Autoflake
   - repo: https://github.com/myint/autoflake
-    rev: v1.4
+    rev: v1.7.7
     hooks:
       - id: autoflake
         args:
@@ -73,7 +73,7 @@ repos:
           - --remove-unused-variables
   # Poetry check
   - repo: https://github.com/python-poetry/poetry
-    rev: 1.2.2
+    rev: 1.2.0rc1
     hooks:
       - id: poetry-check
 #      - id: poetry-lock

{{cookiecutter.package_name}}/poetry.toml

@@ -34,9 +34,10 @@ build-backend = "poetry.core.masonry.api"
 [tool.semantic_release]
 version_toml = ["pyproject.toml:tool.poetry.version"]
 branch = "{{cookiecutter.release_branch}}"
+version_source = "tag"
 hvcs = "gitlab"
 build_command = "poetry build"
-upload_to_pypi = false
+upload_to_repository = true
 repository = "gitlab"
 commit_parser = "semantic_release.history.emoji_parser"
 repository_url = "https://{{cookiecutter.gitlab_host}}/api/v4/projects/{{cookiecutter.package_registry_repository_id}}/packages/pypi"