Skip to content

Commit

Permalink
#179 Update for version testing (#182)
Browse files Browse the repository at this point in the history
* #179 Update for version testing

* #179 Fix enviroment variables
  • Loading branch information
docktermj authored Nov 5, 2024
1 parent 53534f1 commit 354201b
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dependency-scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.11"]
python-version: ["3.12"]

steps:
- name: Checkout repository
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/pytest-darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: pytest darwin
on: [pull_request, workflow_dispatch]

env:
DYLD_LIBRARY_PATH: /opt/senzing/er/lib:/opt/senzing/er/lib/macos
LD_LIBRARY_PATH: /opt/senzing/er/lib:/opt/senzing/er/lib/macos
PYTHONPATH: /Users/runner/work/template-python/template-python/src
SENZING_TOOLS_DATABASE_URL: sqlite3://na:na@nowhere/tmp/sqlite/G2C.db

Expand Down Expand Up @@ -52,6 +54,7 @@ jobs:

- name: Copy /etc files
run: |
sudo mkdir -p /opt/senzing/er/etc
sudo cp testdata/senzing-license/g2.lic /opt/senzing/er/etc/g2.lic
- name: Copy test database files
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pytest-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:

- name: Copy /etc files
run: |
sudo mkdir -p /etc/opt/senzing
sudo cp testdata/senzing-license/g2.lic /etc/opt/senzing/g2.lic
- name: Copy test database files
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ jobs:
python -m pip install --requirement requirements.txt
python -m pip install psutil pytest pytest-cov pytest-schema
- if: matrix.python-version == '3.8' || matrix.python-version == '3.9' || matrix.python-version == '3.10'
name: Install python libraries for python 3.8, 3.9, and 3.10
- if: matrix.python-version == '3.9' || matrix.python-version == '3.10'
name: Install python libraries for python 3.9 and 3.10
run: |
.\\venv\\Scripts\\activate
python -m pip install typing_extensions
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ PATH := $(MAKEFILE_DIRECTORY)/bin:$(PATH)
# Can be overridden with "export"
# Example: "export LD_LIBRARY_PATH=/path/to/my/senzing/er/lib"

SENZING_DIR ?= /opt/senzing/er
CLI_ARGS ?= task1
# DOCKER_BUILDKIT ?= DOCKER_BUILDKIT=0
DOCKER_IMAGE_TAG ?= $(GIT_REPOSITORY_NAME):$(GIT_VERSION)
Expand Down
1 change: 1 addition & 0 deletions makefiles/darwin.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Variables
# -----------------------------------------------------------------------------

SENZING_TOOLS_SENZING_DIRECTORY ?= $(SENZING_DIR)
LD_LIBRARY_PATH ?= $(SENZING_TOOLS_SENZING_DIRECTORY)/lib:$(SENZING_TOOLS_SENZING_DIRECTORY)/lib/macos
DYLD_LIBRARY_PATH := $(LD_LIBRARY_PATH)
SENZING_TOOLS_DATABASE_URL ?= sqlite3://na:na@nowhere/tmp/sqlite/G2C.db
Expand Down
1 change: 1 addition & 0 deletions makefiles/linux.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Variables
# -----------------------------------------------------------------------------

SENZING_TOOLS_SENZING_DIRECTORY ?= $(SENZING_DIR)
LD_LIBRARY_PATH ?= $(SENZING_TOOLS_SENZING_DIRECTORY)/lib
SENZING_TOOLS_DATABASE_URL ?= sqlite3://na:na@nowhere/tmp/sqlite/G2C.db
PATH := $(MAKEFILE_DIRECTORY)/bin:$(PATH)
Expand Down

0 comments on commit 354201b

Please sign in to comment.