Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump version to support modern python. Requires minimum Python 3.8 #251

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bump version to support modern python. Requires minimum Python 3.8 #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d0486c
A fix that gets rid of import pkg_resources
adamryczkowski Oct 7, 2024
15167d0
Version bump
adamryczkowski Oct 7, 2024
cd324d5
A fix
adamryczkowski Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions beautysh/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import re
import sys

import pkg_resources # part of setuptools
import importlib.metadata
from colorama import Fore

# correct function style detection is obtained only if following regex are
Expand Down Expand Up @@ -348,8 +348,8 @@ def parse_function_style(self, style_name):

def get_version(self):
try:
return pkg_resources.require("beautysh")[0].version
except pkg_resources.DistributionNotFound:
return importlib.metadata.version("beautysh")
except importlib.metadata.PackageNotFoundError:
return "Not Available"

def main(self):
Expand Down
7 changes: 4 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[tool.poetry]
name = "beautysh"
version = "6.2.1"
version = "6.2.2"
description = "A Bash beautifier for the masses."
authors = ["Bernardo Meurer <[email protected]>"]
authors = ["Bernardo Meurer <[email protected]>",
"Adam Ryczkowski <[email protected]>"]
license = "MIT"
readme = "README.md"
homepage = "https://github.com/lovesegfault/beautysh"
Expand All @@ -26,7 +27,7 @@ include = ["LICENSE"]
beautysh = "beautysh:main"

[tool.poetry.dependencies]
python = "^3.6.2"
python = "^3.8.0"
colorama = "^0.4.4"
types-colorama = "^0.4.3"
types-setuptools = "^57.4.0"
Expand Down