diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27e1a3b..f27d39f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - name: Script run: | ARGS=( -std=gnu++14 -Wall -g -Og ) - if [[ $CXX =~ ^clang ]]; then + if [[ $CXX == clang* ]]; then ARGS+=( -fsanitize=address,undefined,integer ) else ARGS+=( -fsanitize=address,undefined ) @@ -54,7 +54,7 @@ jobs: python3 -m pip install --upgrade pip python3 -m pip install pylint - name: Script - run: pylint -f github --py-version 3.7 -d design,C0103,W0311,C0301,C0302,C0209 --load-plugins pylint.extensions.code_style,pylint.extensions.comparison_placement,pylint.extensions.for_any_all,pylint.extensions.consider_refactoring_into_while_condition,pylint.extensions.consider_ternary_expression,pylint.extensions.dict_init_mutate,pylint.extensions.docstyle,pylint.extensions.check_elif,pylint.extensions.set_membership,pylint.extensions.typing -e R6104,C1804,C1805 -r y python/*.py + run: pylint -f github --py-version 3.7 -d design,C0103,W0311,C0301,C0302,C0209,R1702 --load-plugins pylint.extensions.code_style,pylint.extensions.comparison_placement,pylint.extensions.for_any_all,pylint.extensions.consider_refactoring_into_while_condition,pylint.extensions.consider_ternary_expression,pylint.extensions.dict_init_mutate,pylint.extensions.docstyle,pylint.extensions.check_elif,pylint.extensions.set_membership,pylint.extensions.typing -e R6104,C1804,C1805 -r y python/*.py continue-on-error: true Ruff: @@ -77,7 +77,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.7", "pypy3.8", "pypy3.9", "pypy3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.7", "pypy3.8", "pypy3.9", "pypy3.10"] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/README.md b/README.md index 78fcbd9..43d7b71 100644 --- a/README.md +++ b/README.md @@ -941,15 +941,15 @@ Values: 5. `color_blue`: Blue 6. `color_magenta`: Magenta 7. `color_cyan`: Cyan -8. `color_light_gray`: Light Gray -9. `color_dark_gray`: Dark Gray -10. `color_light_red`: Light Red -11. `color_light_green`: Light Green -12. `color_light_yellow`: Light Yellow -13. `color_light_blue`: Light Blue -14. `color_light_magenta`: Light Magenta -15. `color_light_cyan`: Light Cyan -16. `color_white`: White +8. `color_white`: White +9. `color_gray`: Gray +10. `color_bright_red`: Bright Red +11. `color_bright_green`: Bright Green +12. `color_bright_yellow`: Bright Yellow +13. `color_bright_blue`: Bright Blue +14. `color_bright_magenta`: Bright Magenta +15. `color_bright_cyan`: Bright Cyan +16. `color_bright_white`: Bright White See here for [examples of the colors](https://misc.flogisoft.com/bash/tip_colors_and_formatting#foreground_text). diff --git a/graphs.hpp b/graphs.hpp index dc642eb..b3d6a1d 100644 --- a/graphs.hpp +++ b/graphs.hpp @@ -59,18 +59,18 @@ namespace graphs color_blue, color_magenta, color_cyan, - color_light_gray, - color_dark_gray, - color_light_red, - color_light_green, - color_light_yellow, - color_light_blue, - color_light_magenta, - color_light_cyan, - color_white + color_white, + color_gray, + color_bright_red, + color_bright_green, + color_bright_yellow, + color_bright_blue, + color_bright_magenta, + color_bright_cyan, + color_bright_white }; - enum color_type const color_types[] = {color_default, color_black, color_red, color_green, color_yellow, color_blue, color_magenta, color_cyan, color_light_gray, color_dark_gray, color_light_red, color_light_green, color_light_yellow, color_light_blue, color_light_magenta, color_light_cyan, color_white}; + enum color_type const color_types[] = {color_default, color_black, color_red, color_green, color_yellow, color_blue, color_magenta, color_cyan, color_white, color_gray, color_bright_red, color_bright_green, color_bright_yellow, color_bright_blue, color_bright_magenta, color_bright_cyan, color_bright_white}; const char *const colors[] = {"\e[39m", "\e[30m", "\e[31m", "\e[32m", "\e[33m", "\e[34m", "\e[35m", "\e[36m", "\e[37m", "\e[90m", "\e[91m", "\e[92m", "\e[93m", "\e[94m", "\e[95m", "\e[96m", "\e[97m"}; diff --git a/python/README.md b/python/README.md index bd87afd..86090e6 100644 --- a/python/README.md +++ b/python/README.md @@ -520,15 +520,15 @@ Values: 5. `color_types.blue`: Blue 6. `color_types.magenta`: Magenta 7. `color_types.cyan`: Cyan -8. `color_types.dark_gray`: Light Gray -9. `color_types.dark_gray`: Dark Gray -10. `color_types.light_red`: Light Red -11. `color_types.light_green`: Light Green -12. `color_types.light_yellow`: Light Yellow -13. `color_types.light_blue`: Light Blue -14. `color_types.light_magenta`: Light Magenta -15. `color_types.light_cyan`: Light Cyan -16. `color_types.white`: White +8. `color_types.white`: White +9. `color_types.gray`: Gray +10. `color_types.bright_red`: Bright Red +11. `color_types.bright_green`: Bright Green +12. `color_types.bright_yellow`: Bright Yellow +13. `color_types.bright_blue`: Bright Blue +14. `color_types.bright_magenta`: Bright Magenta +15. `color_types.bright_cyan`: Bright Cyan +16. `color_types.bright_white`: Bright White See here for [examples of the colors](https://misc.flogisoft.com/bash/tip_colors_and_formatting#foreground_text). diff --git a/python/graphs.py b/python/graphs.py index 2eddce3..3d8da8c 100644 --- a/python/graphs.py +++ b/python/graphs.py @@ -63,15 +63,15 @@ class color_types(IntEnum): blue = auto() magenta = auto() cyan = auto() - light_gray = auto() - dark_gray = auto() - light_red = auto() - light_green = auto() - light_yellow = auto() - light_blue = auto() - light_magenta = auto() - light_cyan = auto() white = auto() + gray = auto() + bright_red = auto() + bright_green = auto() + bright_yellow = auto() + bright_blue = auto() + bright_magenta = auto() + bright_cyan = auto() + bright_white = auto() colors = ("\033[39m", "\033[30m", "\033[31m", "\033[32m", "\033[33m",