Merge branch 'master' into add_support_for_has

elacuesta · elacuesta · commit ad584d69e430 · 2021-07-07T07:59:27.000-03:00
diff --git a/.bandit.yml b/.bandit.yml
@@ -0,0 +1,2 @@
+skips:
+- B101
diff --git a/.flake8 b/.flake8
@@ -0,0 +1,15 @@
+[flake8]
+max-line-length = 99
+ignore = W503
+exclude =
+    .git
+    .tox
+    venv*
+
+    # pending revision
+    cssselect/__init__.py
+    cssselect/parser.py
+    cssselect/xpath.py
+    docs/conf.py
+    setup.py
+    tests/test_cssselect.py
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -0,0 +1,36 @@
+name: Checks
+on: [push, pull_request]
+
+jobs:
+  checks:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+        - python-version: 3
+          env:
+            TOXENV: black
+        - python-version: 3
+          env:
+            TOXENV: flake8
+        - python-version: 3
+          env:
+            TOXENV: pylint
+        - python-version: 3
+          env:
+            TOXENV: security
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Run check
+      env: ${{ matrix.env }}
+      run: |
+        pip install -U pip
+        pip install -U tox
+        tox
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -6,19 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-        - python-version: 2.7
-          env:
-            TOXENV: py
-        - python-version: 3.5
-          env:
-            TOXENV: py
-        - python-version: 3.6
-          env:
-            TOXENV: py
-        - python-version: 3.7
-          env:
-            TOXENV: py
+        python-version: [3.6, 3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2
@@ -29,10 +17,10 @@ jobs:
         python-version: ${{ matrix.python-version }}
 
     - name: Run tests
-      env: ${{ matrix.env }}
       run: |
+        pip install -U pip
         pip install -U tox
-        tox
+        tox -e py
 
     - name: Upload coverage report
-      run: bash <(curl -s https://codecov.io/bash)
+      run: bash <(curl -s https://codecov.io/bash)
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,6 @@
 /dist
 /docs/_build
 /.coverage
-.idea
+.idea
+htmlcov/
+coverage.xml
diff --git a/README.rst b/README.rst
@@ -10,32 +10,30 @@ cssselect: CSS Selectors for Python
    :target: https://pypi.python.org/pypi/cssselect
    :alt: Supported Python Versions
 
-.. image:: https://img.shields.io/travis/scrapy/cssselect/master.svg
-   :target: https://travis-ci.org/scrapy/cssselect
-   :alt: Build Status
+.. image:: https://github.com/scrapy/cssselect/actions/workflows/tests.yml/badge.svg
+   :target: https://github.com/scrapy/cssselect/actions/workflows/tests.yml
+   :alt: Tests
 
 .. image:: https://img.shields.io/codecov/c/github/scrapy/cssselect/master.svg
    :target: https://codecov.io/github/scrapy/cssselect?branch=master
    :alt: Coverage report
 
-*cssselect* parses `CSS3 Selectors`_ and translate them to `XPath 1.0`_
-expressions. Such expressions can be used in lxml_ or another XPath engine
-to find the matching elements in an XML or HTML document.
+**cssselect** is a BSD-licensed Python library to parse `CSS3 selectors`_ and
+translate them to `XPath 1.0`_ expressions.
 
-This module used to live inside of lxml as ``lxml.cssselect`` before it was
-extracted as a stand-alone project.
-
-.. _CSS3 Selectors: https://www.w3.org/TR/css3-selectors/
-.. _XPath 1.0: https://www.w3.org/TR/xpath/
-.. _lxml: http://lxml.de/
+`XPath 1.0`_ expressions can be used in lxml_ or another XPath engine to find
+the matching elements in an XML or HTML document.
 
+Find the cssselect online documentation at https://cssselect.readthedocs.io.
 
 Quick facts:
 
-* Free software: BSD licensed
-* Compatible with Python 2.7 and 3.4+
-* Latest documentation `on Read the Docs <https://cssselect.readthedocs.io/>`_
 * Source, issues and pull requests `on GitHub
   <https://github.com/scrapy/cssselect>`_
-* Releases `on PyPI <http://pypi.python.org/pypi/cssselect>`_
+* Releases `on PyPI <https://pypi.org/project/cssselect/>`_
 * Install with ``pip install cssselect``
+
+
+.. _CSS3 selectors: https://www.w3.org/TR/selectors-3/
+.. _XPath 1.0: https://www.w3.org/TR/xpath/all/
+.. _lxml: https://lxml.de/
diff --git a/pylintrc b/pylintrc
@@ -0,0 +1,34 @@
+[MASTER]
+persistent=no
+
+[MESSAGES CONTROL]
+disable=assignment-from-no-return,
+        bad-continuation,
+        bad-whitespace,
+        c-extension-no-member,
+        consider-using-in,
+        fixme,
+        inconsistent-return-statements,
+        invalid-name,
+        missing-class-docstring,
+        missing-function-docstring,
+        missing-module-docstring,
+        multiple-imports,
+        no-else-return,
+        no-member,
+        no-self-use,
+        raise-missing-from,
+        redefined-builtin,
+        redefined-outer-name,
+        too-few-public-methods,
+        too-many-arguments,
+        too-many-branches,
+        too-many-function-args,
+        too-many-lines,
+        too-many-public-methods,
+        too-many-statements,
+        undefined-variable,
+        unidiomatic-typecheck,
+        unused-argument,
+        unused-import,
+        useless-object-inheritance  # Required for Python 2 support
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,3 @@
+[tool.black]
+line-length = 99
+exclude = 'cssselect/|tests/'
diff --git a/setup.py b/setup.py
@@ -2,45 +2,45 @@
 
 import re
 import os.path
+
 try:
     from setuptools import setup
-    extra_kwargs = {'test_suite': 'cssselect.tests'}
+
+    extra_kwargs = {"test_suite": "cssselect.tests"}
 except ImportError:
     from distutils.core import setup
+
     extra_kwargs = {}
 
 
 ROOT = os.path.dirname(__file__)
-README = open(os.path.join(ROOT, 'README.rst')).read()
-INIT_PY = open(os.path.join(ROOT, 'cssselect', '__init__.py')).read()
+README = open(os.path.join(ROOT, "README.rst")).read()
+INIT_PY = open(os.path.join(ROOT, "cssselect", "__init__.py")).read()
 VERSION = re.search("VERSION = '([^']+)'", INIT_PY).group(1)
 
 
 setup(
-    name='cssselect',
+    name="cssselect",
     version=VERSION,
-    author='Ian Bicking',
-    author_email='ianb@colorstudy.com',
-    maintainer='Paul Tremberth',
-    maintainer_email='paul.tremberth@gmail.com',
-    description=
-        'cssselect parses CSS3 Selectors and translates them to XPath 1.0',
+    author="Ian Bicking",
+    author_email="ianb@colorstudy.com",
+    maintainer="Paul Tremberth",
+    maintainer_email="paul.tremberth@gmail.com",
+    description="cssselect parses CSS3 Selectors and translates them to XPath 1.0",
     long_description=README,
-    url='https://github.com/scrapy/cssselect',
-    license='BSD',
-    packages=['cssselect'],
-    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+    url="https://github.com/scrapy/cssselect",
+    license="BSD",
+    packages=["cssselect"],
+    python_requires=">=3.6",
     classifiers=[
-        'Development Status :: 4 - Beta',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7'
+        "Development Status :: 4 - Beta",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: BSD License",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
     ],
-    **extra_kwargs
+    **extra_kwargs,
 )
diff --git a/tests/requirements.txt b/tests/requirements.txt
diff --git a/tox.ini b/tox.ini
@@ -1,9 +1,37 @@
 [tox]
-envlist = py
+envlist = black,flake8,pylint,security,py
 
 [testenv]
-deps=
-    -r tests/requirements.txt
+deps =
+    lxml>=4.4
+    pytest-cov>=2.8
+    pytest>=5.4
+commands =
+    pytest --cov=cssselect \
+        --cov-report=term-missing --cov-report=html --cov-report=xml \
+        --verbose {posargs: cssselect tests}
+
+[testenv:black]
+deps =
+    black==21.6b0
+commands =
+    black --check {posargs: cssselect setup.py tests}
+
+[testenv:flake8]
+deps =
+    flake8==3.9.2
+commands =
+    flake8 {posargs: cssselect setup.py tests docs/conf.py}
+
+[testenv:pylint]
+deps =
+    {[testenv]deps}
+    pylint==2.8.3
+commands =
+    pylint {posargs: cssselect setup.py tests docs}
 
+[testenv:security]
+deps =
+    bandit
 commands =
-    py.test --cov-report term --cov=cssselect
+    bandit -r -c .bandit.yml {posargs: cssselect}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[tool.black]`
	`2`	`+line-length = 99`
	`3`	`+exclude = 'cssselect/\|tests/'`