Skip to content

Commit

Permalink
Drop support for Python <=3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
dalthviz committed Nov 16, 2022
1 parent 01bb740 commit 1db7348
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 23 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
PYTHON_VERSION: ['2.7', '3.7', '3.10']
PYTHON_VERSION: ['3.7', '3.10']
steps:
- name: Checkout branch
uses: actions/checkout@v2
Expand All @@ -46,7 +46,7 @@ jobs:
conda info
conda list
- name: Format
if: matrix.PYTHON_VERSION == '2.7'
if: matrix.PYTHON_VERSION == '3.7'
shell: bash -l {0}
run: python run_checks_and_format.py
- name: Run tests
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
strategy:
fail-fast: false
matrix:
PYTHON_VERSION: ['2.7', '3.7', '3.8', '3.9', '3.10']
PYTHON_VERSION: ['3.7', '3.8', '3.9', '3.10']
steps:
- name: Checkout branch
uses: actions/checkout@v2
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
strategy:
fail-fast: false
matrix:
PYTHON_VERSION: ['2.7', '3.7', '3.8', '3.9', '3.10']
PYTHON_VERSION: ['3.7', '3.8', '3.9', '3.10']
steps:
- name: Checkout branch
uses: actions/checkout@v2
Expand Down
8 changes: 1 addition & 7 deletions qtsass/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
from __future__ import absolute_import, print_function

# Standard library imports
from collections.abc import Mapping, Sequence
import logging
import os
import sys

# Third party imports
import sass
Expand All @@ -26,12 +26,6 @@
from qtsass.importers import qss_importer


if sys.version_info[0] == 3:
from collections.abc import Mapping, Sequence
else:
from collections import Mapping, Sequence


# yapf: enable

# Constants
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ flaky
isort==4.3.15
pycodestyle==2.5.0
pydocstyle==3.0.0
PySide2; python_version=="3.6"
PySide2; python_version=="3.7"
pytest
pytest-cov
yapf==0.26
7 changes: 2 additions & 5 deletions run_checks_and_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,12 @@

# Standard library imports
from subprocess import PIPE, Popen
import os
import sys


# yapf: enable

# Constants
PY3 = sys.version[0] == '3'
COMMANDS = [
['pydocstyle', 'qtsass'],
['pycodestyle', 'qtsass'],
Expand All @@ -38,9 +36,8 @@ def run_process(cmd_list):
raise OSError('Could not call command list: "%s"' % cmd_list)

out, err = p.communicate()
if PY3:
out = out.decode()
err = err.decode()
out = out.decode()
err = err.decode()
return out, err


Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license_files = LICENSE.txt
# support. Removing this line (or setting universal to 0) will prevent
# bdist_wheel from trying to make a universal wheel. For more see:
# https://packaging.python.org/guides/distributing-packages-using-setuptools/#wheels
universal=1
universal=0

# pydocstyle
# http://www.pydocstyle.org/en/latest/usage.html
Expand Down
7 changes: 2 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,7 @@ def get_description():
'Natural Language :: English',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
Expand All @@ -81,7 +77,8 @@ def get_description():
'Topic :: Software Development :: Libraries :: Python Modules',
),
install_requires=[
'libsass<=0.21.0',
'libsass>=0.22.0',
],
python_requires='>=3.7',
keywords='qt sass qtsass scss css qss stylesheets',
)

0 comments on commit 1db7348

Please sign in to comment.