From 7931a75e9bc3778dccce8a9ee1de8b9c01db438e Mon Sep 17 00:00:00 2001 From: Bryon Lewis Date: Mon, 11 Sep 2023 09:49:44 -0400 Subject: [PATCH] update CI --- .github/workflows/blank.yml | 32 ++++++++++++++++-------- server/poetry.lock | 49 +++++++------------------------------ server/pyproject.toml | 4 +-- 3 files changed, 32 insertions(+), 53 deletions(-) diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml index 08e635491..8d07afa39 100644 --- a/.github/workflows/blank.yml +++ b/.github/workflows/blank.yml @@ -65,23 +65,35 @@ jobs: run: yarn build:electron test-server: - defaults: - run: - working-directory: server name: Server Tests - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: python-version: [3.8] steps: - - uses: actions/checkout@v2 + - name: Update Package References + run: sudo apt-get update + - name: Install system dependencies + run: apt-fast install --no-install-recommends --yes + libgdal30 + libgdal-dev + libproj22 + python3-cachecontrol + python3-dev + python3-poetry + - name: Checkout repository + uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + - name: Install large-image + run: pip install large-image[all] --find-links https://girder.github.io/large_image_wheels + - name: Install gdal + run: pip install gdal --find-links https://girder.github.io/large_image_wheels - name: Install tox - run: | - python -m pip install --upgrade pip; - pip install tox; + run: pip install tox - name: Run tests - run: tox + run: tox -e testunit + working-directory: server + diff --git a/server/poetry.lock b/server/poetry.lock index 42684afe7..0eecd68c6 100644 --- a/server/poetry.lock +++ b/server/poetry.lock @@ -788,19 +788,23 @@ docs = ["furo (>=2023.7.26)", "sphinx (>=7.1.2)", "sphinx-autodoc-typehints (>=1 testing = ["covdefaults (>=2.3)", "coverage (>=7.3)", "diff-cover (>=7.7)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-timeout (>=2.1)"] [[package]] -name = "gdal" -version = "3.7.1.1" +name = "GDAL" +version = "3.5.0" description = "GDAL: Geospatial Data Abstraction Library" category = "main" optional = false -python-versions = ">=3.6.0" +python-versions = "*" files = [ - {file = "GDAL-3.7.1.1.tar.gz", hash = "sha256:d16c6dab28eda6c4b1a571e6dc3e3b0fd824a0a6c1cc1947fc7dcb580c9999de"}, + {file = "GDAL-3.5.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:069b52aed5aa5ebcfc47e9d8d662381d8f7a99404345b699d97089c729fdcb7d"}, ] [package.extras] numpy = ["numpy (>1.0.0)"] +[package.source] +type = "url" +url = "https://github.com/girder/large_image_wheels/raw/wheelhouse/GDAL-3.5.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + [[package]] name = "girder" version = "3.1.16" @@ -1307,26 +1311,6 @@ pyproj = ">=2.2.0" [package.extras] girder = ["girder-large-image (>=1.23.6)"] -[[package]] -name = "large-image-source-mapnik" -version = "1.23.6" -description = "A Mapnik tilesource for large_image." -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "large-image-source-mapnik-1.23.6.tar.gz", hash = "sha256:f3bcce2c4832b191cefb9127b12171fda71bd388822b0e8c9f17ee85846e8aae"}, - {file = "large_image_source_mapnik-1.23.6-py3-none-any.whl", hash = "sha256:fe79fa1b6446a267e5399980d5260b96ce75c2483434f3892afd3bd464afe1a0"}, -] - -[package.dependencies] -large-image = ">=1.23.6" -large-image-source-gdal = ">=1.23.6" -mapnik = "*" - -[package.extras] -girder = ["girder-large-image (>=1.23.6)"] - [[package]] name = "large-image-source-ometiff" version = "1.23.6" @@ -1551,21 +1535,6 @@ babel = ["Babel"] lingua = ["lingua"] testing = ["pytest"] -[[package]] -name = "mapnik" -version = "4.0.0" -description = "Python bindings for Mapnik" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "mapnik-4.0.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b10bedbfbcd94eae164cda62af6c2db4a9ca5c93b0f0f5f20057a6404b4ec7d3"}, -] - -[package.source] -type = "url" -url = "https://github.com/girder/large_image_wheels/raw/wheelhouse/mapnik-4.0.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" - [[package]] name = "markupsafe" version = "2.1.3" @@ -2871,4 +2840,4 @@ girder-large-image = [] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.10" -content-hash = "27043de12989ef8f964cb9529675f60be52518b48e6106ee566e3f8d2b3756fe" +content-hash = "8f65fe5b00a18f9489f878c07f8c6196efb86f44cd3d2fc208c0a6b432df239f" diff --git a/server/pyproject.toml b/server/pyproject.toml index 9ba3a1616..faef02103 100644 --- a/server/pyproject.toml +++ b/server/pyproject.toml @@ -62,16 +62,15 @@ requests = ">=2.27.1" urllib3 = "<1.27" girder-large-image = "^1.17.0" large-image = "^1.17.0" -large-image-source-pil = "^1.17.0" simplejpeg = "^1.6.4" large-image-tasks = "^1.17.0" large-image-converter = "^1.17.0" bitarray = "^2.5.1" +large-image-source-pil = "^1.17.0" large-image-source-gdal = "^1.17.0" large-image-source-tiff = "^1.17.0" large-image-source-ometiff = "^1.17.0" large-image-source-openjpeg = "^1.17.0" -large-image-source-mapnik = "^1.17.0" [tool.poetry.group.dev.dependencies] numpy = "^1.21.4" opencv-python = "^4.5.5" @@ -93,7 +92,6 @@ rabbit_user_queues = "rabbitmq_user_queues:GirderPlugin" [tool.poetry.plugins."girder_worker_plugins"] dive_tasks = "dive_tasks:DIVEPlugin" - [[tool.poetry.source]] name = "large-image" url = "https://girder.github.io/large_image_wheels/"