diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 03cc398..b4883a1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,9 +34,7 @@ jobs: key: venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }} - name: Install dependencies - if: steps.cache.outputs.cache-hit != 'true' - run: | - poetry install --no-interaction --no-root + run: poetry install --no-interaction - name: Linting run: poetry run pre-commit run --all-files @@ -51,18 +49,6 @@ jobs: python-version: [ '3.9', '3.10'] poetry-version: [ 1.2.1 ] - services: - rdf4j: - # Docker Hub image - image: eclipse/rdf4j-workbench - ports: - - 8080:8080 - blazegraph: - # Docker Hub image - image: openkbs/blazegraph - ports: - - 9999:9999 - runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -93,8 +79,7 @@ jobs: key: venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }} - name: Install dependencies - if: steps.cache.outputs.cache-hit != 'true' - run: poetry install --no-interaction --no-root + run: poetry install --no-interaction - name: Run pytest if: ${{ ( runner.os != 'Linux' ) || ( matrix.python-version != '3.9' ) }} @@ -102,7 +87,7 @@ jobs: - name: Run pytest with coverage if: ${{ ( runner.os == 'Linux' ) && ( matrix.python-version == '3.9' ) }} - run: poetry run pytest -q --cov=cimsparql --cov-report=xml tests + run: poetry run pytest -q --cov=psseio --cov-report=xml tests - name: Upload coverage if: ${{ ( runner.os == 'Linux' ) && ( matrix.python-version == '3.9' ) }} diff --git a/poetry.lock b/poetry.lock index 770fac4..e842112 100644 --- a/poetry.lock +++ b/poetry.lock @@ -26,6 +26,7 @@ mypy-extensions = ">=0.4.3" pathspec = ">=0.9.0" platformdirs = ">=2" tomli = {version = ">=1.1.0", markers = "python_full_version < \"3.11.0a7\""} +typing-extensions = {version = ">=3.10.0.0", markers = "python_version < \"3.10\""} [package.extras] colorama = ["colorama (>=0.4.3)"] @@ -231,7 +232,10 @@ optional = false python-versions = ">=3.8" [package.dependencies] -numpy = {version = ">=1.21.0", markers = "python_version >= \"3.10\""} +numpy = [ + {version = ">=1.21.0", markers = "python_version >= \"3.10\""}, + {version = ">=1.20.3", markers = "python_version < \"3.10\""}, +] python-dateutil = ">=2.8.1" pytz = ">=2020.1" @@ -407,6 +411,14 @@ category = "dev" optional = false python-versions = ">=3.7" +[[package]] +name = "typing-extensions" +version = "4.4.0" +description = "Backported and Experimental Type Hints for Python 3.7+" +category = "dev" +optional = false +python-versions = ">=3.7" + [[package]] name = "virtualenv" version = "20.16.5" @@ -426,8 +438,8 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7 [metadata] lock-version = "1.1" -python-versions = "^3.10" -content-hash = "6ee9c976f250ebb46443d9f59ad488a01eec0049f166d469f1b71d3a8562373a" +python-versions = "^3.9" +content-hash = "8e0f899d013fbd99965f31d595cdffe92e14b205c79f960183e0051ab46be63c" [metadata.files] attrs = [] @@ -467,4 +479,5 @@ pyyaml = [] six = [] toml = [] tomli = [] +typing-extensions = [] virtualenv = [] diff --git a/pyproject.toml b/pyproject.toml index 5ee85ab..dc7ac04 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ authors = ["Statnett Datascience "] repository = "https://github.com/statnett/psseio.git" [tool.poetry.dependencies] -python = "^3.10" +python = "^3.9" pandas = "*" [tool.poetry.dev-dependencies]