From 856eb9f08e602a1ae23719f576c4e838d91f6fa8 Mon Sep 17 00:00:00 2001
From: mraniki <8766259+mraniki@users.noreply.github.com>
Date: Tue, 18 Jul 2023 20:51:15 +0200
Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=91=B7=20CI=20Change=20in=20pytoml=20?=
=?UTF-8?q?+=20ruff?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pyproject.toml | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 0866017..21a3457 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,8 +28,29 @@ dynaconf = "^3.1.12"
pyparsing = "^3.0.9"
emoji = "^2.5.1"
-[tool.poetry.dev-dependencies]
-python-semantic-release = "^7.34.3"
+[tool.poetry.group.dev.dependencies]
+python-semantic-release = "^8.0.1"
+ruff = "^0.0.278"
+
+[tool.ruff]
+select = [
+ "E", # pycodestyle
+ "F", # pyflakes
+ "I", # isort
+]
+exclude = [
+ ".github/*",
+ "docs/*",
+]
+ignore = ["E401","F401","F811"]
+format = "github"
+
+[tool.pylint.exceptions]
+overgeneral-exceptions = [
+ "builtins.BaseException",
+ "builtins.Exception",
+ "builtins.RuntimeError",
+]
[tool.poetry.group.test.dependencies]
pytest = "^7.0"
From a5d5b970eaafe3e9480458726a30877f9b75059f Mon Sep 17 00:00:00 2001
From: mraniki <8766259+mraniki@users.noreply.github.com>
Date: Wed, 19 Jul 2023 07:21:15 +0200
Subject: [PATCH 2/5] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=F0=9F=91=B7=20CI=20Ch?=
=?UTF-8?q?ange?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/renovate.json | 24 +++++++---
...2\200\215\342\231\202\357\270\217Flow.yml" | 14 ++----
README.md | 2 +-
pyproject.toml | 48 +++++++++++++++----
4 files changed, 60 insertions(+), 28 deletions(-)
diff --git a/.github/renovate.json b/.github/renovate.json
index 26e83e4..9a1aa63 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -2,13 +2,23 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base",
- ":semanticCommitTypeAll(β¬οΈ)"
+ ":semanticCommitTypeAll(β¬οΈ)",
+ ":disableDependencyDashboard"
],
"semanticCommits": "enabled",
- "pip_requirements": {
- "enabled": true,
- "fileMatch": [
- "(^|/)([\\w-]*)requirements\\.(txt|pip)$"
- ]
- }
+ "labels": ["dependencies"],
+ "packageRules": [
+ {
+ "matchUpdateTypes": ["minor", "patch"],
+ "matchCurrentVersion": "!/^0/",
+ "automerge": true,
+ "minimumReleaseAge": "8 hours"
+ },
+ {
+ "matchUpdateTypes": ["major"],
+ "automerge": false,
+ "matchBaseBranches": ["dev"],
+ "minimumReleaseAge": "30 days"
+ }
+ ]
}
diff --git "a/.github/workflows/\360\237\221\267\342\200\215\342\231\202\357\270\217Flow.yml" "b/.github/workflows/\360\237\221\267\342\200\215\342\231\202\357\270\217Flow.yml"
index 89122ed..bd780e1 100644
--- "a/.github/workflows/\360\237\221\267\342\200\215\342\231\202\357\270\217Flow.yml"
+++ "b/.github/workflows/\360\237\221\267\342\200\215\342\231\202\357\270\217Flow.yml"
@@ -1,12 +1,11 @@
-name: π·ββοΈFlow
+name: π·Flow
on:
push:
branches: ["main"]
pull_request:
workflow_dispatch:
- #schedule:
- # - cron: '42 23 * * 5'
+
jobs:
lint:
@@ -24,10 +23,6 @@ jobs:
needs: [lint]
uses: mraniki/coding_toolset/.github/workflows/πBuild.yml@main
secrets: inherit
- prerelease:
- needs: [build]
- uses: mraniki/coding_toolset/.github/workflows/π₯·Prerelease.yml@main
- secrets: inherit
release:
needs: [build]
uses: mraniki/coding_toolset/.github/workflows/π¦Release.yml@main
@@ -35,7 +30,4 @@ jobs:
docker:
needs: [release]
uses: mraniki/coding_toolset/.github/workflows/π³Docker.yml@main
- secrets: inherit
- # deploy:
- # needs: [docker]
- # uses: mraniki/coding_toolset/.github/workflows/βοΈDeploy.yml@main
\ No newline at end of file
+ secrets: inherit
\ No newline at end of file
diff --git a/README.md b/README.md
index c569f51..e5fb196 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
-
+
diff --git a/pyproject.toml b/pyproject.toml
index 21a3457..f4d9cbf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -87,14 +87,44 @@ omit = [
]
[tool.semantic_release]
-version_variable = ["pyproject.toml:version","findmyorder/__init__.py:__version__"]
-branch = "main"
-upload_to_pypi = true
-upload_to_release = true
+upload_to_vcs_release = true
+version_variables = ["pyproject.toml:version","findmyorder/__init__.py:__version__"]
build_command = "pip install poetry && poetry build"
-commit_parser = "semantic_release.history.emoji_parser"
-use_textual_changelog_sections = true
-major_emoji = "BREAKING,π₯,:boom:"
-minor_emoji = "feat,π₯,:egg:,π,:rocket:,π,:lipstick:,β¨,:sparkles:"
-patch_emoji = "fix,bump,Update,π¨,:art:,π,:bug:,π,:ambulance:,β‘,:zap:,π₯,:fire:,π¨,:rotating_light:,β»οΈ,:recycle:,π§,:wrench:,β¬οΈ,:arrow_up:,π©Ή,:adhesive_bandage:,π·,:construction_worker:,π,:memo:,π,:lock:,π½,:alien:,π¬,:speech_balloon:,π₯
,:goal_net:,β
,:white_check_mark:,π³,:whale:,π,:see_no_evil:,βοΈ,:alembic:,π§,:monocle_face:,π,:mute:,π:volume:"
+commit_parser = "emoji"
+major_tags = [
+ "BREAKING",
+ "π₯",
+ ":boom:",
+ ]
+minor_tags = ["feat",
+ "π₯",":egg:",
+ "π",":rocket:",
+ "π",":lipstick:",
+ "β¨",":sparkles:",
+]
+patch_tags = ["fix","bump","Update",
+ "π¨",":art:",
+ "π",":bug:",
+ "π",":ambulance:",
+ "β‘",":zap:",
+ "π₯",":fire:",
+ "π¨",":rotating_light:",
+ "β»οΈ",":recycle:",
+ "π§",":wrench:",
+ "β¬οΈ",":arrow_up:",
+ "π©Ή",":adhesive_bandage:",
+ "π·",":construction_worker:",
+ "π",":memo:",
+ "π",":lock:",
+ "π½",":alien:",
+ "π¬",":speech_balloon:",
+ "π₯
",":goal_net:",
+ "β
",":white_check_mark:",
+ "π³",":whale:",
+ "π",":see_no_evil:",
+ "βοΈ",":alembic:",
+ "π§",":monocle_face:",
+ "π",":mute:",
+ "π",":volume:",
+]
From 382aefc3aad8639a03013ffbd86de27a641eff86 Mon Sep 17 00:00:00 2001
From: mraniki <8766259+mraniki@users.noreply.github.com>
Date: Wed, 19 Jul 2023 07:27:24 +0200
Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=9A=A8=20linter=20config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pyproject.toml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pyproject.toml b/pyproject.toml
index f4d9cbf..c21c2d5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,6 +44,7 @@ exclude = [
]
ignore = ["E401","F401","F811"]
format = "github"
+fixable = ["ALL"]
[tool.pylint.exceptions]
overgeneral-exceptions = [
From 7015c7bdbc0624d37219e9c2990931c22516c020 Mon Sep 17 00:00:00 2001
From: mraniki <8766259+mraniki@users.noreply.github.com>
Date: Wed, 19 Jul 2023 07:34:54 +0200
Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=9A=A8=20linter=20sorting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
examples/example.py | 1 +
findmyorder/main.py | 13 +++++++++++--
tests/test_unit.py | 2 ++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/examples/example.py b/examples/example.py
index 200d6b3..b792af5 100644
--- a/examples/example.py
+++ b/examples/example.py
@@ -7,6 +7,7 @@
import uvicorn
from fastapi import FastAPI
+
from findmyorder import FindMyOrder, __version__
logging.basicConfig(
diff --git a/findmyorder/main.py b/findmyorder/main.py
index 7ace469..6f193f4 100644
--- a/findmyorder/main.py
+++ b/findmyorder/main.py
@@ -6,9 +6,18 @@
import emoji
from pyparsing import (
- Combine, Optional, Word, alphas,
- nums, one_of, pyparsing_common, Suppress)
+ Combine,
+ Optional,
+ Suppress,
+ Word,
+ alphas,
+ nums,
+ one_of,
+ pyparsing_common,
+)
+
from findmyorder import __version__
+
from .config import settings
diff --git a/tests/test_unit.py b/tests/test_unit.py
index 216aff2..691f74e 100644
--- a/tests/test_unit.py
+++ b/tests/test_unit.py
@@ -3,7 +3,9 @@
"""
from datetime import datetime
+
import pytest
+
from findmyorder import FindMyOrder, settings
From f5d33f4273b42330c4060477e01905136cdb0ae9 Mon Sep 17 00:00:00 2001
From: mraniki
Date: Wed, 19 Jul 2023 05:42:02 +0000
Subject: [PATCH 5/5] Update Requirements
---
.requirements/requirements.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.requirements/requirements.txt b/.requirements/requirements.txt
index 01e5ec2..a1081d8 100644
--- a/.requirements/requirements.txt
+++ b/.requirements/requirements.txt
@@ -1,3 +1,3 @@
-findmyorder
-fastapi
-uvicorn
+dynaconf==3.2.0 ; python_version >= "3.10" and python_version < "4.0"
+emoji==2.6.0 ; python_version >= "3.10" and python_version < "4.0"
+pyparsing==3.1.0 ; python_version >= "3.10" and python_version < "4.0"
|