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

[WIP] Remove older python support #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
7 changes: 3 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout to master
uses: actions/checkout@master

uses: actions/checkout@v3
- name: Setup python
uses: actions/setup-python@v1
uses: actions/setup-python@v3
with:
python-version: '3.8'
python-version: '3.x'
architecture: 'x64'

- name: Build Package and Check
Expand Down
27 changes: 17 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
name: Tests

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:
types: ["opened", "synchronize", "reopened"]
create:


jobs:
pre-commit:
Expand All @@ -9,12 +16,12 @@ jobs:

steps:
- name: Checkout to master
uses: actions/checkout@master
uses: actions/checkout@v3

- name: Setup python
uses: actions/setup-python@v1
uses: actions/setup-python@v3
with:
python-version: '3.8'
python-version: '3.x'
architecture: 'x64'

- name: Pre-Commit Checks
Expand All @@ -33,13 +40,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ '3.5', '3.6', '3.7', '3.8' ]
python-version: [ "3.8", "3.9", "3.10" ]
steps:
- name: Checkout to master
uses: actions/checkout@master
uses: actions/checkout@v3

- name: Setup Python-${{ matrix.python-version }}
uses: actions/setup-python@v1
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
architecture: x64
Expand Down Expand Up @@ -70,12 +77,12 @@ jobs:

steps:
- name: Checkout to master
uses: actions/checkout@master
uses: actions/checkout@v3

- name: Setup python
uses: actions/setup-python@v1
uses: actions/setup-python@v3
with:
python-version: '3.8'
python-version: '3.x'
architecture: 'x64'

- name: Setup test environment
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def pre_commit(session):
session.run("pre-commit", "run", "-a")


@nox.session(python=["3.5", "3.6", "3.7", "3.8"])
@nox.session(python=["3.8", "3.9", "3.10"])
def tests(session):
"""Run unit test over different python env with code coverage"""
session.install("pytest", "pytest-cov", "-e", ".")
Expand Down
6 changes: 1 addition & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@
"Intended Audience :: Developers",
"Topic :: Utilities",
"Topic :: Software Development :: User Interfaces",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3",
],
description="Geometry of a rectangular screen region",
setup_requires=["setuptools_scm"],
Expand Down
3 changes: 2 additions & 1 deletion xrectsel/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
help="Select cursor foreground color",
)
@click.option(
"-cb", "--cursor-background",
"-cb",
"--cursor-background",
default=(0, 0, 0),
type=click.Tuple([int, int, int]),
help="Select cursor background color",
Expand Down