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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
[submodule "cxx"]
path = cxx
url = ../51degrees-cxx
[submodule "pipeline/fiftyone_pipeline_derivedproperty/src/fiftyone_pipeline_derivedproperty/derived-properties"]
path = pipeline/fiftyone_pipeline_derivedproperty/src/fiftyone_pipeline_derivedproperty/derived-properties
url = ../derived-properties
12 changes: 12 additions & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,18 @@ A package's `ExtraPaths` in `ci/packages.json` cannot be a folder inside
cxx update therefore releases no package, even when it brings new translations
in `cxx/data/ip-intelligence`.

`pipeline/fiftyone_pipeline_derivedproperty` runs the scripts of
[derived-properties](https://github.com/51Degrees/derived-properties), which is
its submodule `src/fiftyone_pipeline_derivedproperty/derived-properties`, inside
the package so that the wheel carries its `scripts` folder (`MANIFEST.in`) and
nothing else from it. Its tests run every case file in the submodule's `tests`
folder, so moving the submodule moves the cases the tests run. `parse.py`,
`validate.py`, `evaluate.py` and `canonical.py` follow the reference tools in
the submodule's `tools` folder function for function, with `jsvalues.py`
holding the JavaScript rules they rely on, so a change there is made here the
same way. The package is `"Publish": false` in `ci/packages.json`, so it is
tested in every build and not published.

## Releases

Pull requests go to `rc`, not `main`, and stay drafts until they have been
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ own folder, which has its own README.

| Product | Folder | PyPI packages |
| --- | --- | --- |
| Pipeline API | [pipeline](pipeline/readme.md) | `fiftyone_pipeline_core`, `_engines`, `_engines_fiftyone`, `_cloudrequestengine`, `_translation`, `_did` |
| Pipeline API | [pipeline](pipeline/readme.md) | `fiftyone_pipeline_core`, `_engines`, `_engines_fiftyone`, `_cloudrequestengine`, `_translation`, `_did`, `_derivedproperty` (not yet published) |
| Device Detection | [device-detection](device-detection/readme.md) | `fiftyone_devicedetection`, `_shared`, `_cloud`, `_onpremise` |
| IP Intelligence | [ip-intelligence](ip-intelligence/readme.md) | `fiftyone_ipintelligence`, `_shared`, `_cloud`, `_onpremise`, `_translation` |
| Location | [location](location/readme.md) | `fiftyone_location` |
Expand Down
8 changes: 8 additions & 0 deletions ci/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@
"DependsOn": ["fiftyone_pipeline_core"],
"Publish": true
},
{
"Name": "fiftyone_pipeline_derivedproperty",
"Product": "pipeline",
"Path": "pipeline/fiftyone_pipeline_derivedproperty",
"Ignore": ["**/tox.ini"],
"DependsOn": ["fiftyone_pipeline_core"],
"Publish": false
},
{
"Name": "fiftyone_pipeline_did",
"Product": "pipeline",
Expand Down
2 changes: 1 addition & 1 deletion pipeline/ci/build-project.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ param (
# anything builds. See ci/copy-owid-source.ps1 for the full reasoning.
& "$PSScriptRoot/copy-owid-source.ps1" -RepoRoot $RepoName

$packages = "fiftyone_pipeline_core", "fiftyone_pipeline_engines", "fiftyone_pipeline_engines_fiftyone", "fiftyone_pipeline_cloudrequestengine", "fiftyone_pipeline_translation"
$packages = "fiftyone_pipeline_core", "fiftyone_pipeline_engines", "fiftyone_pipeline_engines_fiftyone", "fiftyone_pipeline_cloudrequestengine", "fiftyone_pipeline_translation", "fiftyone_pipeline_derivedproperty"
./python/build-project.ps1 -RepoName $RepoName -Packages $packages

exit $LASTEXITCODE
2 changes: 1 addition & 1 deletion pipeline/ci/run-unit-tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ param (
$addopts = $env:PYTEST_ADDOPTS
$env:PYTEST_ADDOPTS = '-m "not live"'
try {
$packages = "fiftyone_pipeline_core", "fiftyone_pipeline_engines", "fiftyone_pipeline_engines_fiftyone", "fiftyone_pipeline_translation", "fiftyone_pipeline_did"
$packages = "fiftyone_pipeline_core", "fiftyone_pipeline_engines", "fiftyone_pipeline_engines_fiftyone", "fiftyone_pipeline_translation", "fiftyone_pipeline_did", "fiftyone_pipeline_derivedproperty"
./python/run-unit-tests.ps1 -RepoName $RepoName -Packages $packages
} finally {
$env:PYTEST_ADDOPTS = $addopts
Expand Down
Loading
Loading