Skip to content
Merged
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
18 changes: 7 additions & 11 deletions .github/workflows/common_tests_different_db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,28 +129,24 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v3

- uses: actions/setup-python@v4
- name: Install Python and uv
uses: astral-sh/setup-uv@v6
with:
enable-cache: true
python-version: '3.14'

- name: Setup Python dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt

- name: Install Development/Checked out version of DatabaseLibrary
- name: Install DatabaseLibrary and dependecies
run: |
pip install -e ${{ github.workspace }}
uv sync --locked

- name: Setup Python DB module
if: matrix.pip_install != 'none'

run: |
pip install ${{ matrix.pip_install }}
uv pip install ${{ matrix.pip_install }}

- name: Tests for ${{ matrix.job_name }}
working-directory: ./test
run: >-
uv run
robot
-d results
--xunit result.xml
Expand Down
21 changes: 9 additions & 12 deletions .github/workflows/common_tests_different_rf_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,32 +43,29 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v3

- uses: actions/setup-python@v4
- name: Install Python and uv
uses: astral-sh/setup-uv@v6
with:
enable-cache: true
python-version: ${{ matrix.python-version }}

- name: Setup Python and dependencies
- name: Install DatabaseLibrary and dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
uv sync --locked --dev

- name: Install special RF version
if: matrix.rf_version != 'default'

if: matrix.rf-version != 'default'
run: |
pip install -U robotframework==${{matrix.rf-version}}
uv pip install -U robotframework==${{matrix.rf-version}}

- name: Install Development/Checked out version of DatabaseLibrary
run: |
pip install -e ${{ github.workspace }}

- name: Setup Python DB module
run: |
pip install ${{ env.PIP_INSTALL_DB_MODULE }}
uv pip install ${{ env.PIP_INSTALL_DB_MODULE }}

- name: Tests for RF ${{ matrix.rf-version }} on Python ${{ matrix.python-version }}
working-directory: ./test
run: >-
uv run
robot
-d results
--xunit result.xml
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@ name: Unit tests
on: [push, pull_request]

jobs:
build:
tests:
strategy:
fail-fast: false
matrix:
include:
- os: 'ubuntu-latest'
python-version: '3.8'
rf-version: '5.0.1'
- os: 'ubuntu-latest'
python-version: '3.9'
rf-version: '5.0.1'
Expand Down Expand Up @@ -42,20 +39,23 @@ jobs:
with:
fetch-depth: 2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
- name: Install Python and uv
uses: astral-sh/setup-uv@v6
with:
enable-cache: true
python-version: ${{ matrix.python-version }}

- name: Install dependencies
- name: Install DatabaseLibrary and dependencies
run: |
uv sync --locked --dev

- name: Install RF specific version and pytest dependencies
run: |
python -m pip install --upgrade pip
pip install robotframework==${{ matrix.rf-version }} coverage pytest
pip install .
uv pip install robotframework==${{ matrix.rf-version }} coverage pytest

- name: Run unit tests with coverage
run:
coverage run -m pytest
uv run coverage run -m pytest

- name: Codecov
uses: codecov/codecov-action@v3
Expand Down
3 changes: 3 additions & 0 deletions argumentfile.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
--output-dir logs
--log-level DEBUG:INFO
--suite common_tests
43 changes: 25 additions & 18 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,38 +1,45 @@
[build-system]
requires = [
"setuptools>=61.0",
"robotframework>=5.0.1",
"robotframework-assertion-engine",
"sqlparse"
]
build-backend = "setuptools.build_meta"

[project]
dynamic = ["version"]

name = "robotframework-databaselibrary"
authors = [{name="Franz Allan Valencia See", email="franz.see@gmail.com"},
]
description = "Database Library for Robot Framework"
readme = "README.md"
requires-python = ">=3.8.1"
authors = [
{name="Franz Allan Valencia See", email="franz.see@gmail.com"},
{name="Andre Mochinin"}
]

requires-python = ">=3.9"
dependencies = [
"robotframework>=5.0.1",
"robotframework-assertion-engine",
"sqlparse"
"robotframework-assertion-engine>=3.0.3",
"sqlparse>=0.5.5",
]
license = "Apache-2.0"
classifiers = [
"Programming Language :: Python :: 3",
"License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent",
]
license = {text = "Apache License 2.0"}
dynamic = ["version"]
keywords = ["Robot Framework", "Libraries"]

[project.urls]
"Homepage" = "https://github.com/MarketSquare/Robotframework-Database-Library"
"Keyword docs" = "http://marketsquare.github.io/Robotframework-Database-Library/"

[build-system]
requires = ["setuptools>=61.0"]
build-backend = "setuptools.build_meta"

[tool.setuptools.dynamic]
version = {attr = "DatabaseLibrary.__version__"}
version = {attr = "DatabaseLibrary.version.VERSION"}

[dependency-groups]
dev = [
"pre-commit>=3.5.0",
"psycopg2-binary>=2.9.10",
"robotcode[runner]>=1.9.0",
"robotframework-excellib>=2.0.1",
]

[tool.black]
line-length = 120
Expand Down
7 changes: 0 additions & 7 deletions requirements.txt

This file was deleted.

4 changes: 2 additions & 2 deletions robot.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
output-dir = "logs"
args = ["--argumentfile", "argumentfile.txt"]

default-profiles = ["postgresql", "common_tests"]
log-level = "DEBUG:INFO"

[profiles.common_tests]
suites=["common tests"]
Expand Down
Loading
Loading