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.

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

[break] Update colored and drop support for Python 3.8 #112

Merged
merged 4 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
environment: pypi-deploy
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.7
- name: Set up Python 3.9
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- name: Package repobee-junit4
run: |
python -m pip install --upgrade pip wheel
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: 3.9
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
python-version: [3.8, 3.9, '3.10', '3.11']
python-version: [3.9, '3.10', '3.11']
exclude:
- os: macos-latest
python-version: 3.9
- os: macos-latest
python-version: '3.10'
- os: macos-latest
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3.8"
python: "3.9"

sphinx:
configuration: docs/conf.py
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Build Status](https://travis-ci.com/repobee/repobee-junit4.svg?branch=master)](https://travis-ci.com/repobee/repobee-junit4)
[![Code Coverage](https://codecov.io/gh/repobee/repobee-junit4/branch/master/graph/badge.svg)](https://codecov.io/gh/repobee/repobee-junit4)
[![PyPi Version](https://badge.fury.io/py/repobee-junit4.svg)](https://badge.fury.io/py/repobee-junit4)
![Supported Python Versions](https://img.shields.io/badge/python-3.8%2C%203.9%2C%203.10%2C%203.11-blue.svg)
![Supported Python Versions](https://img.shields.io/badge/python-3.9%2C%203.10%2C%203.11-blue.svg)
![Supported Platforms](https://img.shields.io/badge/platforms-Linux%2C%20macOS-blue.svg)
[![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)

Expand Down
6 changes: 3 additions & 3 deletions repobee_junit4/_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import math
from typing import Optional

from colored import bg, style
from colored import bg, Style

from repobee_junit4 import _java

Expand Down Expand Up @@ -143,14 +143,14 @@ def test_result_header(
else:
test_results = "Timed out after {} seconds".format(math.ceil(timeout))
msg = "{}{}{}: {}".format(
title_color, test_class_name, style.RESET, test_results
title_color, test_class_name, Style.RESET, test_results
)
return msg


def format_results(test_results, compile_failed, verbose, very_verbose):
def format_compile_error(res):
msg = "{}Compile error:{} {}".format(bg("red"), style.RESET, res.msg)
msg = "{}Compile error:{} {}".format(bg("red"), Style.RESET, res.msg)
if very_verbose:
return msg
elif verbose:
Expand Down
4 changes: 2 additions & 2 deletions requirements.test.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
-r requirements.txt

appdirs
bandit>=1.7.0
black
codecov
colored
daiquiri
flake8
pluggy>=0.8.0
pylint
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"pytest-mock",
"pytest>=4.0.0",
]
required = ["repobee>=3.4.1", "daiquiri", "colored"]
required = ["repobee>=3.4.1", "daiquiri", "colored>=2.0.0"]

setup(
name="repobee-junit4",
Expand All @@ -45,10 +45,10 @@
extras_require=dict(TEST=test_requirements),
include_package_data=True,
zip_safe=False,
python_requires=">=3.9",
classifiers=[
"Development Status :: 3 - Alpha",
"Intended Audience :: Education",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand Down
Loading