Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: martibosch/meteora
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1ac7aeece7b484946e13d1b8f373a525f04898bf
Choose a base ref
..
head repository: martibosch/meteora
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 94e26c1ae6d612cc7eb0c436f8461018cce7f2b9
Choose a head ref
Showing with 83 additions and 82 deletions.
  1. +6 −5 .pre-commit-config.yaml
  2. +77 −77 pyproject.toml
11 changes: 6 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -22,11 +22,6 @@ repos:
additional_dependencies: [prettier, prettier-plugin-toml, prettier-plugin-ini]
types: ["ini", "toml", "yaml"]

- repo: https://github.com/kieran-ryan/pyprojectsort
rev: v0.4.0
hooks:
- id: pyprojectsort

- repo: https://github.com/executablebooks/mdformat
rev: 0.7.22 # Use the ref you want to point at
hooks:
@@ -36,6 +31,12 @@ repos:
- mdformat-gfm
- mdformat-black

- repo: https://github.com/pappasam/toml-sort
rev: v0.24.2
hooks:
- id: toml-sort-fix
args: ["--in-place"]

- repo: https://github.com/adrienverge/yamllint.git
rev: v1.36.0
hooks:
154 changes: 77 additions & 77 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
[build-system]
build-backend = "setuptools.build_meta"
requires = [
"setuptools>=61.0",
"setuptools>=61.0"
]

[project]
authors = [
{ email = "marti.bosch@epfl.ch", name = "Martí Bosch" },
{email = "marti.bosch@epfl.ch", name = "Martí Bosch"}
]
classifiers = [
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
"Natural Language :: English",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
"Natural Language :: English",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13"
]
dependencies = [
"geopandas>=1.0.0",
"matplotlib",
"requests",
"requests-cache",
"requests-oauthlib",
"tqdm",
"geopandas>=1.0.0",
"matplotlib",
"requests",
"requests-cache",
"requests-oauthlib",
"tqdm"
]
description = "Pythonic interface to access data from meteorological stations"
name = "meteora"
@@ -36,34 +36,34 @@ text = "GPL-3.0"

[project.optional-dependencies]
cx = [
"contextily",
"contextily"
]
dev = [
"build",
"commitizen",
"pip",
"pre-commit",
"toml",
"tox",
"twine",
"build",
"commitizen",
"pip",
"pre-commit",
"toml",
"tox",
"twine"
]
doc = [
"myst-parser",
"nbsphinx",
"pydata-sphinx-theme",
"sphinx",
"sphinxemoji",
"myst-parser",
"nbsphinx",
"pydata-sphinx-theme",
"sphinx",
"sphinxemoji"
]
ox = [
"osmnx",
"osmnx"
]
test = [
"coverage[toml]",
"pytest",
"pytest-cov",
"python-dotenv[cli]",
"requests-mock",
"ruff",
"coverage[toml]",
"pytest",
"pytest-cov",
"python-dotenv[cli]",
"requests-mock",
"ruff"
]

[project.urls]
@@ -82,21 +82,21 @@ version_scheme = "semver"

[tool.coverage.report]
exclude_lines = [
"except ImportError",
"except ModuleNotFoundError",
"if self.debug:",
"pragma: no cover",
"raise NotImplementedError",
"except ImportError",
"except ModuleNotFoundError",
"if self.debug:",
"pragma: no cover",
"raise NotImplementedError"
]
ignore_errors = true
omit = [
"docs/conf.py",
"tests/*",
"docs/conf.py",
"tests/*"
]

[tool.coverage.run]
source = [
"meteora",
"meteora"
]

[tool.ruff]
@@ -107,89 +107,89 @@ docstring-code-format = true

[tool.ruff.lint]
select = [
"D",
"E",
"F",
"I",
"D",
"E",
"F",
"I"
]

[tool.ruff.lint.isort]
known-first-party = [
"meteora",
"meteora"
]

[tool.ruff.lint.per-file-ignores]
"**/__init__.py" = [
"F401",
"F401"
]
"tests/test_meteora.py" = [
"D",
"D"
]

[tool.ruff.lint.pydocstyle]
convention = "numpy"

[tool.setuptools.packages.find]
include = [
"meteora",
"meteora.*",
"meteora",
"meteora.*"
]

[tool.tox]
env_list = [
"3.10",
"3.11",
"3.12",
"3.13",
"lint",
"3.10",
"3.11",
"3.12",
"3.13",
"lint"
]
requires = [
"tox>=4.19",
"tox>=4.19"
]

[tool.tox.env.lint]
commands = [
"python -m build",
"sphinx-build docs docs/_build",
"twine check dist/*",
"python -m build",
"sphinx-build docs docs/_build",
"twine check dist/*"
]
extras = [
"dev",
"doc",
"test",
"dev",
"doc",
"test"
]
whitelist_externals = [
"build",
"sphinx-build",
"twine",
"build",
"sphinx-build",
"twine"
]

[tool.tox.env_run_base]
commands = [
"dotenv -f .keys.env run pytest -s --cov=meteora --cov-append --cov-report=xml --cov-report term-missing tests",
["dotenv", "-f", ".keys.env", "run", "pytest", "-s", "--cov=meteora", "--cov-report=xml", "tests"]
]
conda_deps = [
"gdal>=3.3",
"gdal>=3.3"
]
extras = [
"ox",
"test",
"ox",
"test"
]
whitelist_externals = [
"pytest",
"pytest"
]

[tool.tox.gh.python]
"3.10" = [
"3.10",
"3.10"
]
"3.11" = [
"3.11",
"3.11"
]
"3.12" = [
"3.12",
"3.12"
]
"3.13" = [
"3.13",
"lint",
"3.13",
"lint"
]