Type hints and changes to class inheritance

.editorconfig

@@ -0,0 +1,19 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.py]
+charset = utf-8
+indent_style = space
+indent_size = 4
+max_line_length = 160
+
+[*.yml]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = True

.github/dependabot.yml

@@ -0,0 +1,16 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/lint-python.yml

@@ -0,0 +1,59 @@
+name: Ruff
+
+on:
+  push:
+    paths:
+      - "**.py"
+      - .github/workflows/lint-python.yml
+      - pyproject.toml
+  pull_request:
+    paths:
+      - "**.py"
+      - pyproject.toml
+  workflow_dispatch:
+
+jobs:
+  ruff:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - "3.12"
+          - "3.11"
+          - "3.10"
+          - "3.9"
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: pip
+
+      - name: Install uv and create venv
+        run: |
+          pip install -U pip uv
+          uv venv
+
+      - name: Enable macOS/Linux venv
+        if: runner.os != 'Windows'
+        run: |
+          source .venv/bin/activate
+          echo $PATH >> $GITHUB_PATH
+
+      - name: Enable Windows venv
+        if: runner.os == 'Windows'
+        run: |
+          .venv\Scripts\activate
+          echo $env:path >> $ENV:GITHUB_PATH
+
+      - name: Install dependencies
+        run: |
+          uv pip install -e . ruff ydiff
+
+      - name: Lint the code with ruff
+        run: |
+          ruff check $(git ls-files '*.py') --diff | ydiff -s

.github/workflows/pytest.yml

@@ -0,0 +1,64 @@
+name: Pytest
+
+on:
+  push:
+    paths:
+      - "**.py"
+      - .github/workflows/pytest.yml
+      - pyproject.toml
+  pull_request:
+    paths:
+      - "**.py"
+      - pyproject.toml
+  workflow_dispatch:
+
+jobs:
+  pytest:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          # - "ubuntu-latest" # doesn't work without headless
+          - "windows-latest"
+          - "macos-latest"
+        python-version:
+          - "3.12"
+          - "3.11"
+          - "3.10"
+          - "3.9"
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: pip
+
+      - name: Install uv and create venv
+        run: |
+          pip install -U pip uv
+          uv venv
+
+      - name: Enable macOS/Linux venv
+        if: runner.os != 'Windows'
+        run: |
+          source .venv/bin/activate
+          echo $PATH >> $GITHUB_PATH
+
+      - name: Enable Windows venv
+        if: runner.os == 'Windows'
+        run: |
+          .venv\Scripts\activate
+          echo $env:path >> $ENV:GITHUB_PATH
+
+      - name: Install dependencies
+        run: |
+          uv pip install -r requirements.txt
+          uv pip install -e . pytest pytest-cov
+
+      - name: Test with pytest
+        run: |
+          pytest --junitxml=junit/test-results.xml --cov=com --cov-report=xml --cov-report=html

.gitignore

@@ -100,6 +100,9 @@ ENV/
 # mkdocs documentation
 /site
 
+# Poetry
+poetry.lock
+
 # mypy
 .mypy_cache/
 

.travis.yml

@@ -1,13 +1,13 @@
 sudo: false
 language: python
 python:
-  - '2.7'
-  - '3.4'
-  - '3.5'
-  - '3.6'
+  - '3.9'
+  - '3.10'
+  - '3.11'
+  - '3.12'
 install:
   - pip install tox-travis
-  - wget -N https://chromedriver.storage.googleapis.com/99.0.4844.51/chromedriver_linux64.zip -P ~/
+  - wget -N https://chromedriver.storage.googleapis.com/100.0.4896.20/chromedriver_linux64.zip -P ~/
   - unzip ~/chromedriver_linux64.zip -d ~/
   - rm ~/chromedriver_linux64.zip
   - sudo mv -f ~/chromedriver /usr/local/share/
@@ -24,7 +24,7 @@ deploy:
     on:
       all_branches: true
       tags: false
-      python: 3.6
+      python: 3.12
   # Real PyPI in tags (ie. GitHub releases)
   - provider: pypi
     distributions: sdist bdist_wheel --universal
@@ -33,6 +33,6 @@ deploy:
     on:
       branch: master
       tags: true
-      python: 3.6
+      python: 3.12
 addons:
   chrome: stable

README.md

@@ -1,7 +1,6 @@
 ![Requestium](https://user-images.githubusercontent.com/14966348/32966130-8bb15b00-cbb7-11e7-9faf-85963ec5bd82.png)
 ========
 
-[![Build Status](https://travis-ci.org/tryolabs/requestium.svg?branch=master)](https://travis-ci.org/tryolabs/requestium)
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 
 Requestium is a Python library that merges the power of [Requests](https://github.com/requests/requests), [Selenium](https://github.com/SeleniumHQ/selenium), and [Parsel](https://github.com/scrapy/parsel) into a single integrated tool for automatizing web actions.

pyproject.toml

@@ -4,6 +4,7 @@ version = "0.3.0"
 description = ""
 authors = ["Joaquin Alori <joaquin@tryolabs.com>"]
 readme = "README.md"
+license = "BSD-3-Clause"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<=3.13"
@@ -13,7 +14,15 @@ selenium = "^4.15.2"
 tldextract = "^5.1.1"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.4.3"
+pytest = "^7.4.4"
+
+[tool.ruff]
+line-length = 160
+
+[tool.ruff.lint]
+select = ["E4", "E7", "E9", "F"]
+extend-select = ["B", "W", "C"]
+ignore = ["C400", "C401"]
 
 [build-system]
 requires = ["poetry-core"]

requestium/__init__.py

@@ -1,5 +1,8 @@
+"""Requestium is a Python library that merges the power of Requests, Selenium, and Parsel into a single integrated tool for automatizing web actions."""
+
 from selenium.common import exceptions  # noqa: F401
+from selenium.webdriver.common.by import By  # noqa: F401
 from selenium.webdriver.common.keys import Keys  # noqa: F401
 from selenium.webdriver.support.ui import Select  # noqa: F401
 
-from .requestium import Session  # noqa: F401
+from .requestium_session import Session  # noqa: F401