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
1 change: 1 addition & 0 deletions tangram/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/dist-frontend
18 changes: 18 additions & 0 deletions tangram/eslint.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { globalIgnores } from "eslint/config";
import {
defineConfigWithVueTs,
vueTsConfigs
} from "@vue/eslint-config-typescript";
import pluginVue from "eslint-plugin-vue";
import skipFormatting from "@vue/eslint-config-prettier/skip-formatting";

export default defineConfigWithVueTs(
{
name: "app/files-to-lint",
files: ["**/*.{ts,mts,js,mjs,vue}"]
},
globalIgnores(["**/dist/**", "**/dist-frontend/**", ".venv"]),
pluginVue.configs["flat/recommended"],
vueTsConfigs.recommended,
skipFormatting // use prettier for code formatting, eslint for code quality
);
6 changes: 6 additions & 0 deletions tangram/justfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
fmt:
uv run ruff check tangram_* --fix || true
uv run ruff format tangram_* || true
pnpm i || true
pnpm fmt || true
pnpm lint || true
5 changes: 2 additions & 3 deletions tangram/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"scripts": {
"build": "pnpm --filter \"./tangram_*\" build",
"lint": "eslint --fix",
"fmt": "prettier --write --cache \"packages/**/*.{js,ts,mjs,vue}\""
"fmt": "prettier --write --cache \"tangram_*/**/*.{js,ts,mjs,vue}\""
},
"devDependencies": {
"@vue/eslint-config-prettier": "^10.2.0",
Expand All @@ -14,7 +14,6 @@
"jiti": "^2.6.1",
"prettier": "^3.7.4",
"typescript": "^5.9.3",
"vite": "^7.2.6",
"@vitejs/plugin-vue": "^6.0.2"
"vite": "^7.2.7"
}
}
308 changes: 150 additions & 158 deletions tangram/pnpm-lock.yaml

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions tangram/pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
packages:
- "tangram_*"

# to use a local version of tangram-core instead, uncomment this.
# before committing, remember to re-comment and run `pnpm i`!
# overrides:
# "@open-aviation/tangram-core": "link:../../tangram/packages/tangram_core"
56 changes: 56 additions & 0 deletions tangram/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# NOTE: this creates a `.venv` WITHIN this directory, separate from ../.venv
# it is necessary for tools like `ruff` to properly locate `tangram_core`.
# in the future we might want to merge it with ../
[project]
name = "tangram_workspace"
version = "0.2.1"
requires-python = ">=3.10"
dependencies = []
classifiers = [
"Private :: Do Not Upload"
]

[dependency-groups]
dev = [
"ipykernel>=6.29.5",
{ include-group = "typing" },
{ include-group = "lint" },
]
lint = ["ruff>=0.12.7"]
typing = ["mypy>=1.17.1"]

[tool.uv.workspace]
members = ["tangram_*"]

[tool.mypy]
python_version = "3.10"
platform = "posix"

color_output = true
pretty = true
show_column_numbers = true
strict = true
check_untyped_defs = true
ignore_missing_imports = true
warn_no_return = true
warn_redundant_casts = true
warn_unused_configs = true
warn_unused_ignores = true

[tool.ruff]
line-length = 88
target-version = "py310"
extend-exclude = [
"*.pyi", # don't format files generated by pyo3_stub_gen
]

[tool.ruff.lint]
select = [
"E",
"W", # pycodestyle
"F", # pyflakes
"I", # isort
"NPY", # numpy
"DTZ", # flake8-datetimez
"RUF",
]
10 changes: 8 additions & 2 deletions tangram/tangram_landing/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
{
"name": "@open-aviation/tangram-landing",
"version": "0.2.0",
"version": "0.2.1",
"private": true,
"type": "module",
"main": "src/tangram_landing/index.ts",
"scripts": {
"build": "vite build"
},
"dependencies": {
"@open-aviation/tangram-core": "^0.2.0"
"@open-aviation/tangram-core": "^0.2.1"
},
"devDependencies": {
"@deck.gl/core": "^9.2.5",
"@deck.gl/extensions": "^9.2.5",
"@deck.gl/layers": "^9.2.5",
"vue": "^3.5.25"
}
}
7 changes: 4 additions & 3 deletions tangram/tangram_landing/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ build-backend = "hatchling.build"

[project]
name = "tangram_landing"
version = "0.2.0"
dependencies = ["tangram_core>=0.2.0", "traffic"]
version = "0.2.1"
dependencies = ["tangram_core>=0.2.1", "traffic"]
authors = [{ name = "Xavier Olive", email = "git@xoolive.org" }]

[project.entry-points."tangram_core.plugins"]
Expand All @@ -17,7 +17,8 @@ traffic = { path = "../..", editable = true }

[tool.hatch.build.targets.sdist]
ignore-vcs = true
include = ["dist-frontend/*", "src/*"]
include = ["dist-frontend/*", "src/*", "package.json"]

[tool.hatch.build.targets.wheel.force-include]
"dist-frontend" = "tangram_landing/dist-frontend"
"package.json" = "tangram_landing/package.json"
Loading