Compare commits

...

5 Commits

Author SHA1 Message Date
Gergő Jedlicska 61cfa388ba chore: add github workflows 2025-02-26 12:43:20 +01:00
Gergő Jedlicska ef5a570dd4 fix main publish url 2025-02-26 12:17:10 +01:00
KatKatKateryna 424d7d9caf fixed speckle_types for proxies (#388) 2025-02-26 07:20:01 +08:00
Gergő Jedlicska 6aa643837a Merge pull request #387 from specklesystems/jrm/fix-docker-compose
fic(ci): docker compose file missing frontend origin env var
2025-02-19 18:35:34 +01:00
Jedd Morgan 32cbb33e10 Add Frontend origin header 2025-02-19 17:04:30 +00:00
5 changed files with 7 additions and 99 deletions
-56
View File
@@ -1,56 +0,0 @@
name: "Specklepy test and build"
on:
pull_request:
branches:
- "v3-dev"
push:
branches:
- "v3-dev"
jobs:
ci:
name: continuous-integration
runs-on: ubuntu-latest
strategy:
matrix:
python-version:
- "3.10"
- "3.11"
- "3.12"
- "3.13"
steps:
- uses: actions/checkout@v4
- name: Install uv and set the python version
uses: astral-sh/setup-uv@v5
with:
python-version: ${{ matrix.python-version }}
enable-cache: true
cache-dependency-glob: "uv.lock"
- name: Install the project
run: uv sync --all-extras --dev
- uses: actions/cache@v3
with:
path: ~/.cache/pre-commit/
key: ${{ hashFiles('.pre-commit-config.yaml') }}
- name: Run pre-commit
run: uv run pre-commit run --all-files
# - name: Run Speckle Server
# run: docker compose up -d
# - name: Run tests
# run: uv run pytest --cov --cov-report xml:reports/coverage.xml --junitxml=reports/test-results.xml
# - uses: codecov/codecov-action@v5
# if: matrix.python-version == 3.13
# with:
# fail_ci_if_error: true # optional (default = false)
# files: ./reports/test-results.xml # optional
# token: ${{ secrets.CODECOV_TOKEN }}
- name: Minimize uv cache
run: uv cache prune --ci
-33
View File
@@ -1,33 +0,0 @@
# Publish a release to PyPI.
name: "Publish to PyPI"
on:
workflow_run:
workflows: ["Specklepy test and build"]
branches: [v3-dev]
types:
- completed
jobs:
pypi-publish:
name: Upload to PyPI
runs-on: ubuntu-latest
environment:
name: testpypi
permissions:
# For PyPI's trusted publishing.
id-token: write
steps:
- name: "Install uv"
uses: astral-sh/setup-uv@v5
- uses: actions/checkout@v4
with:
# This is necessary so that we have the tags.
fetch-depth: 0
- name: "Build artifacts"
run: uv build
- name: Publish to PyPi
run: uv publish --index test
- name: Test package install
run: uv run --index test --with specklepy --no-project -- python -c "import specklepy"
+2 -5
View File
@@ -6,7 +6,7 @@ services:
# Speckle Server dependencies
#######
postgres:
image: "postgres:16-alpine"
image: "postgres:16.4-alpine3.20@sha256:d898b0b78a2627cb4ee63464a14efc9d296884f1b28c841b0ab7d7c42f1fffdf"
restart: always
environment:
POSTGRES_DB: speckle
@@ -49,10 +49,6 @@ services:
retries: 30
start_period: 10s
####
# Speckle Server
#######
speckle-server:
image: speckle/speckle-server:latest
restart: always
@@ -79,6 +75,7 @@ services:
# TODO: Change this to the URL of the speckle server, as accessed from the network
CANONICAL_URL: "http://127.0.0.1:8080"
SPECKLE_AUTOMATE_URL: "http://127.0.0.1:3030"
FRONTEND_ORIGIN: "http://127.0.0.1:8081"
# TODO: Change thvolumes:
REDIS_URL: "redis://redis"
+1 -1
View File
@@ -79,7 +79,7 @@ ignore = ["UP006", "UP007", "UP035"]
[[tool.uv.index]]
name = "pypi"
url = "https://pypi.org/simple/"
publish-url = "https://pypi.org/legacy/"
publish-url = "https://upload.pypi.org/legacy/"
[[tool.uv.index]]
name = "test"
+4 -4
View File
@@ -9,7 +9,7 @@ from specklepy.objects.other import RenderMaterial
@dataclass(kw_only=True)
class ColorProxy(
Base,
speckle_type="Models.Proxies.ColorProxy",
speckle_type="Speckle.Core.Models.Proxies.ColorProxy",
detachable={"objects"},
):
objects: List[str]
@@ -20,7 +20,7 @@ class ColorProxy(
@dataclass(kw_only=True)
class GroupProxy(
Base,
speckle_type="Models.Proxies.GroupProxy",
speckle_type="Speckle.Core.Models.Proxies.GroupProxy",
detachable={"objects"},
):
objects: List[str]
@@ -31,7 +31,7 @@ class GroupProxy(
class InstanceProxy(
Base,
IHasUnits,
speckle_type="Models.Proxies.InstanceProxy",
speckle_type="Speckle.Core.Models.Instances.InstanceProxy",
):
definition_id: str
transform: List[float]
@@ -41,7 +41,7 @@ class InstanceProxy(
@dataclass(kw_only=True)
class InstanceDefinitionProxy(
Base,
speckle_type="Models.Proxies.InstanceDefinitionProxy",
speckle_type="Speckle.Core.Models.Instances.InstanceDefinitionProxy",
detachable={"objects"},
):
objects: List[str]