Merge remote-tracking branch 'origin/master' into pylint

Author: elacuesta

.bandit.yml

@@ -0,0 +1,2 @@
+skips:
+- B101

.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+end_of_line = lf
+
+[*.{yml,yaml}]
+indent_size = 2

.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

.github/workflows/checks.yml

@@ -0,0 +1,33 @@
+name: Checks
+on: [push, pull_request]
+
+jobs:
+  checks:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+        - 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

.github/workflows/publish.yml

@@ -0,0 +1,31 @@
+name: Publish
+on: [push]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    if: startsWith(github.event.ref, 'refs/tags/')
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3
+
+    - name: Check Tag
+      id: check-release-tag
+      run: |
+        if [[ ${{ github.event.ref }} =~ ^refs/tags/[0-9]+[.][0-9]+[.][0-9]+(rc[0-9]+|[.]dev[0-9]+)?$ ]]; then
+          echo ::set-output name=release_tag::true
+        fi
+
+    - name: Publish to PyPI
+      if: steps.check-release-tag.outputs.release_tag == 'true'
+      run: |
+        pip install --upgrade setuptools wheel twine
+        python setup.py sdist bdist_wheel
+        export TWINE_USERNAME=__token__
+        export TWINE_PASSWORD=${{ secrets.PYPI_TOKEN }}
+        twine upload dist/*

.github/workflows/tests.yml

@@ -0,0 +1,38 @@
+name: Tests
+on: [push, pull_request]
+
+jobs:
+  tests:
+    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
+
+    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 tests
+      env: ${{ matrix.env }}
+      run: |
+        pip install -U tox
+        tox
+
+    - name: Upload coverage report
+      run: bash <(curl -s https://codecov.io/bash)

.travis.yml

@@ -56,7 +56,7 @@ def __repr__(self):
 
     def add_condition(self, condition):
         if self.condition:
-            self.condition = '%s and (%s)' % (self.condition, condition)
+            self.condition = '(%s) and (%s)' % (self.condition, condition)
         else:
             self.condition = condition
         return self
@@ -180,7 +180,7 @@ def css_to_xpath(self, css, prefix='descendant-or-self::'):
             This string is prepended to the XPath expression for each selector.
             The default makes selectors scoped to the context node’s subtree.
         :raises:
-            :class:`SelectorSyntaxError` on invalid selectors,
+            :class:`~cssselect.SelectorSyntaxError` on invalid selectors,
             :class:`ExpressionError` on unknown/unsupported selectors,
             including pseudo-elements.
         :returns:
@@ -457,19 +457,19 @@ def xpath_nth_child_function(self, xpath, function, last=False,
         if a == 0:
             return xpath.add_condition('%s = %s' % (siblings_count, b_min_1))
 
-        expr = []
+        expressions = []
 
         if a > 0:
             # siblings count, an+b-1, is always >= 0,
             # so if a>0, and (b-1)<=0, an "n" exists to satisfy this,
             # therefore, the predicate is only interesting if (b-1)>0
             if b_min_1 > 0:
-                expr.append('%s >= %s' % (siblings_count, b_min_1))
+                expressions.append('%s >= %s' % (siblings_count, b_min_1))
         else:
             # if a<0, and (b-1)<0, no "n" satisfies this,
             # this is tested above as an early exist condition
             # otherwise,
-            expr.append('%s <= %s' % (siblings_count, b_min_1))
+            expressions.append('%s <= %s' % (siblings_count, b_min_1))
 
         # operations modulo 1 or -1 are simpler, one only needs to verify:
         #
@@ -495,9 +495,14 @@ def xpath_nth_child_function(self, xpath, function, last=False,
                 b_neg = '+%s' % b_neg
                 left = '(%s %s)' % (left, b_neg)
 
-            expr.append('%s mod %s = 0' % (left, a))
+            expressions.append('%s mod %s = 0' % (left, a))
 
-        xpath.add_condition(' and '.join(expr))
+        if len(expressions) > 1:
+            template = '(%s)'
+        else:
+            template = '%s'
+        xpath.add_condition(' and '.join(template % expression
+                                         for expression in expressions))
         return xpath
 
     def xpath_nth_last_child_function(self, xpath, function):

cssselect/xpath.py

@@ -17,6 +17,7 @@ disable=assignment-from-no-return,
         no-else-return,
         no-member,
         no-self-use,
+        raise-missing-from,
         redefined-builtin,
         redefined-outer-name,
         too-few-public-methods,

pylintrc

@@ -1,5 +1,5 @@
 codecov
 lxml;python_version!="3.4"
 lxml<=4.3.5;python_version=="3.4"
-pytest
+pytest >=4.6, <4.7  # 4.7 drops support for Python 2.7 and 3.4
 pytest-cov