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
10 changes: 5 additions & 5 deletions .github/workflows/python-ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ on: [push, pull_request]
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: postgres
POSTGRES_DB: stix

jobs:
test-job:
runs-on: ubuntu-latest

services:
postgres:
image: postgres:11
image: postgres
# Provide the password for postgres
env:
POSTGRES_USER: postgres
Expand All @@ -34,9 +34,9 @@ jobs:

name: Python ${{ matrix.python-version }} Build
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4.2.2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5.4.0
with:
python-version: ${{ matrix.python-version }}
- name: Install and update essential dependencies
Expand All @@ -48,7 +48,7 @@ jobs:
run: |
tox
- name: Upload coverage information to Codecov
uses: codecov/codecov-action@v4.2.0
uses: codecov/codecov-action@v5.4.0
with:
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: false # optional (default = false)
Expand Down
2 changes: 1 addition & 1 deletion stix2/test/v21/test_datastore_relational_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import stix2.registry
import stix2.v21

_DB_CONNECT_URL = f"postgresql://{os.getenv('POSTGRES_USER', 'postgres')}:{os.getenv('POSTGRES_PASSWORD', 'postgres')}@0.0.0.0:5432/postgres"
_DB_CONNECT_URL = f"postgresql://{os.getenv('POSTGRES_USER', 'postgres')}:{os.getenv('POSTGRES_PASSWORD', 'postgres')}@0.0.0.0:5432/{os.getenv('POSTGRES_DB', 'postgres')}"

store = RelationalDBStore(
PostgresBackend(_DB_CONNECT_URL, True),
Expand Down
16 changes: 8 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ envlist = py38,py39,py310,py311,py312,packaging,pre-commit-check

[testenv]
deps =
tox
pytest
pytest-cov
coverage
taxii2-client
rapidfuzz
haversine
medallion
sqlalchemy
sqlalchemy_utils
psycopg2

extras =
taxii
semantic
relationaldb

commands =
python -m pytest --cov=stix2 stix2/test/ --cov-report term-missing -W ignore::stix2.exceptions.STIXDeprecationWarning

passenv = GITHUB_*
passenv =
GITHUB_*
POSTGRES_*

[testenv:packaging]
deps =
Expand Down
Loading