Skip to content
Closed
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
12 changes: 12 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.gitignore
__pycache__/
*.py[cod]
*.egg-info/
.venv/
.env
.env.*
.vscode
.idea
node_modules
dist
build
20 changes: 12 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
.env
myenv
src/venv.
shsohos
*.pyc
src/.streamlit/secrets.toml
# setuptools / packaging
*.egg-info/

# uv
.venv/
.python-version
uv.lock
uv.lock.bak

# Python
__pycache__/
*.py[cod]
*$py.class
uv.lock.bak
uv.lock

# Secrets
.env
src/.streamlit/secrets.toml

*.egg-info/
44 changes: 24 additions & 20 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
[build-system]
requires = ["hatchling"]
build-backend = "hatchling.build"
requires = [
"setuptools>=61",
"setuptools-git-versioning>=2.0,<3",
]
build-backend = "setuptools.build_meta"


[project]
name = "analysis-dashboard"
version = "0.1.0"
dynamic = ["version"]
description = "Analysis dashboard for OCF forecasting systems"
readme = {file = "README.md", content-type = "text/markdown"}
requires-python = ">=3.12.0,<3.13"
readme = { file = "README.md", content-type = "text/markdown" }
requires-python = ">=3.12,<3.13"

dependencies = [
"altair==5.5.0",
"requests==2.32.3",
Expand All @@ -32,46 +37,45 @@ dependencies = [
"fiona>=1.9,<2.0",
"herbie-data",
"numcodecs>=0.12,<1.0",

# upstream torch handling (ROLLED BACK as requested)
"torch @ https://download.pytorch.org/whl/cpu/torch-2.3.1%2Bcpu-cp312-cp312-linux_x86_64.whl ; platform_system == 'Linux' and platform_machine == 'x86_64'",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you role this change back please?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remove comment, thats not needed

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove # comment, its not needed

"torch @ https://download.pytorch.org/whl/cpu/torch-2.3.1%2Bcpu-cp312-cp312-win_amd64.whl ; platform_system == 'Windows' and platform_machine == 'AMD64'",
"torch @ https://download.pytorch.org/whl/cpu/torch-2.3.1-cp312-none-macosx_11_0_arm64.whl ; platform_system == 'Darwin' and platform_machine == 'arm64'",

"matplotlib>=3.8,<4.0",
"dp-sdk",
"aiocache",
]


[project.optional-dependencies]
dev = [
"pytest",
"pytest-cov",
"ruff",
]

[tool.hatch.metadata]
allow-direct-references = true

[tool.hatch.build.targets.wheel]
packages = ["src"]
[tool.setuptools]
package-dir = { "" = "src" }

[tool.setuptools.packages.find]
where = ["src"]


[tool.setuptools-git-versioning]
enabled = true

[tool.hatch.build.targets.sdist]
include = [
"src/",
"pyproject.toml",
"README.md",
]

[tool.uv]
dev-dependencies = [
"pytest",
"pytest-cov",
"ruff",
]
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why has this been removed?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was restructuring the packaging while debugging the versioning issue and accidentally removed the [tool.uv].dev-dependencies block while consolidating configuration. There was no intention to drop the dev tooling. I’ve restored the following so local development and CI continue to work as before:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why have you not put it back in then?

index-url = "https://download.pytorch.org/whl/cpu"
extra-index-url = ["https://pypi.org/simple"]

[tool.uv.sources]
dp-sdk = { url = "https://github.com/openclimatefix/data-platform/releases/download/v0.13.2/dp_sdk-0.13.2-py3-none-any.whl" }


[tool.pytest.ini_options]
testpaths = ["tests"]
python_files = ["test_*.py"]
Expand Down
Loading