Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • anlambert/swh-vault
  • lunar/swh-vault
  • swh/devel/swh-vault
  • douardda/swh-vault
  • olasd/swh-vault
  • marmoute/swh-vault
  • rboyer/swh-vault
7 results
Show changes
Commits on Source (54)
Hide whitespace changes
Inline Side-by-side
Showing
with 193 additions and 196 deletions
.copier-answers.yml 0 → 100644
View file @ 9dd1fd8d
# Changes here will be overwritten by Copier
_commit: v0.3.3
_src_path: https://gitlab.softwareheritage.org/swh/devel/swh-py-template.git
description: Software Heritage vault
distribution_name: swh-vault
have_cli: true
have_workers: true
package_root: swh/vault
project_name: swh.vault
python_minimal_version: '3.7'
readme_format: rst
.git-blame-ignore-revs
View file @ 9dd1fd8d
# Enable black
# python: Reformat code with black
be318c7fc864410fb44187fdaeade22ca3ee9914
# python: Reformat code with black 22.3.0
19fc56a7ffa2a7715b8b0dcb1673f0d6f697313a
d746a27c972076801a7a217261443f10b186d15b
.gitignore
View file @ 9dd1fd8d
*.egg-info/
*.pyc
*.sw?
*~
/.coverage
/.coverage.*
.coverage
.eggs/
.hypothesis
.mypy_cache
.tox
__pycache__
build/
dist/
*.egg-info
version.txt
.tox/
.mypy_cache/
# these are symlinks created by a hook in swh-docs' main sphinx conf.py
docs/README.rst
docs/README.md
# this should be a symlink for people who want to build the sphinx doc
# without using tox, generally created by the swh-env/bin/update script
docs/Makefile.sphinx
.pre-commit-config.yaml
View file @ 9dd1fd8d
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: check-json
- id: check-yaml
- repo: https://github.com/python/black
rev: 25.1.0
hooks:
- id: black
- repo: https://github.com/PyCQA/isort
rev: 6.0.0
hooks:
- id: isort
- repo: https://github.com/pycqa/flake8
rev: 5.0.4
rev: 7.1.1
hooks:
- id: flake8
additional_dependencies: [flake8-bugbear==22.9.23]
additional_dependencies: [flake8-bugbear==24.12.12, flake8-pyproject]
- repo: https://github.com/codespell-project/codespell
rev: v2.2.2
rev: v2.4.1
hooks:
- id: codespell
name: Check source code spelling
stages: [commit]
stages: [pre-commit]
- id: codespell
name: Check commit message spelling
stages: [commit-msg]
- repo: local
hooks:
......@@ -28,13 +41,13 @@ repos:
pass_filenames: false
language: system
types: [python]
- repo: https://github.com/PyCQA/isort
rev: 5.10.1
hooks:
- id: isort
- repo: https://github.com/python/black
rev: 22.10.0
hooks:
- id: black
- id: twine-check
name: twine check
description: call twine check when pushing an annotated release tag
entry: bash -c "ref=$(git describe) &&
[[ $ref =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] &&
(python3 -m build --sdist && twine check $(ls -t dist/* | head -1)) || true"
pass_filenames: false
stages: [pre-push]
language: python
additional_dependencies: [twine, build]
CODE_OF_CONDUCT.md
View file @ 9dd1fd8d
......@@ -6,7 +6,7 @@ In the interest of fostering an open and welcoming environment, we as Software
Heritage contributors and maintainers pledge to making participation in our
project and our community a harassment-free experience for everyone, regardless
of age, body size, disability, ethnicity, sex characteristics, gender identity
and expression, level of experience, education, socio-economic status,
and expression, level of experience, education, socioeconomic status,
nationality, personal appearance, race, religion, or sexual identity and
orientation.
......
MANIFEST.in deleted 100644 → 0
View file @ 348b6e09
include conftest.py
include Makefile
include Makefile.local
include README.db_testing
include README.dev
include requirements*.txt
include version.txt
recursive-include sql *.sql
recursive-include swh/vault/sql *.sql
recursive-include swh py.typed
README.rst deleted 120000 → 0
View file @ 348b6e09
docs/README.rst
\ No newline at end of file
README.rst 0 → 100644
View file @ 9dd1fd8d
Software Heritage - Vault
=========================
User-facing service that allows to retrieve parts of the archive as
self-contained bundles (e.g., individual releases, entire repository snapshots,
etc.)
The creation of a bundle is called "cooking" a bundle.
Architecture
------------
The vault is made of two main parts:
1. a stateful RPC server called the **backend**
2. Celery tasks, called **cookers**
conftest.py
View file @ 9dd1fd8d
# Copyright (C) 2020 The Software Heritage developers
# Copyright (C) 2020-2023 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
pytest_plugins = [
"swh.storage.pytest_plugin",
"swh.loader.pytest_plugin",
]
docs/Makefile
View file @ 9dd1fd8d
include ../../swh-docs/Makefile.sphinx
include Makefile.sphinx
docs/README.rst deleted 100644 → 0
View file @ 348b6e09
Software Heritage - Vault
=========================
User-facing service that allows to retrieve parts of the archive as
self-contained bundles (e.g., individual releases, entire repository snapshots,
etc.)
The creation of a bundle is called "cooking" a bundle.
Architecture
------------
The vault is made of two main parts:
1. a stateful RPC server called the **backend**
2. Celery tasks, called **cookers**
docs/README.rst 0 → 120000
View file @ 9dd1fd8d
../README.rst
\ No newline at end of file
mypy.ini deleted 100644 → 0
View file @ 348b6e09
[mypy]
namespace_packages = True
warn_unused_ignores = True
# 3rd party libraries without stubs (yet)
[mypy-celery.*]
ignore_missing_imports = True
[mypy-dulwich.*]
ignore_missing_imports = True
[mypy-fastimport.*]
ignore_missing_imports = True
[mypy-pkg_resources.*]
ignore_missing_imports = True
[mypy-psycopg2.*]
ignore_missing_imports = True
[mypy-pytest.*]
ignore_missing_imports = True
[mypy-pytest_postgresql.*]
ignore_missing_imports = True
pyproject.toml
View file @ 9dd1fd8d
[project]
name = "swh.vault"
authors = [
{name="Software Heritage developers", email="swh-devel@inria.fr"},
]
description = "Software Heritage vault"
readme = {file = "README.rst", content-type = "text/x-rst"}
requires-python = ">=3.10"
classifiers = [
"Programming Language :: Python :: 3",
"Intended Audience :: Developers",
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
"Operating System :: OS Independent",
"Development Status :: 5 - Production/Stable",
]
dynamic = ["version", "dependencies", "optional-dependencies"]
[tool.setuptools]
zip-safe = false
[tool.setuptools.packages.find]
include = ["swh.*"]
[tool.setuptools.dynamic]
dependencies = {file = ["requirements.txt", "requirements-swh.txt"]}
[tool.setuptools.dynamic.optional-dependencies]
graph = {file = ["requirements-swh-graph.txt"]}
testing = {file = ["requirements-test.txt"]}
[project.entry-points."swh.cli.subcommands"]
"swh.vault" = "swh.vault.cli"
[project.entry-points."swh.vault.classes"]
"remote" = "swh.vault.api.client:RemoteVaultClient"
"postgresql" = "swh.vault.backend:VaultBackend"
"memory" = "swh.vault.in_memory_backend:InMemoryVaultBackend"
[project.entry-points."swh.workers"]
"swh.vault" = "swh.vault:register_tasks"
[project.urls]
"Homepage" = "https://gitlab.softwareheritage.org/swh/devel/swh-vault"
"Bug Reports" = "https://gitlab.softwareheritage.org/swh/devel/swh-vault/-/issues"
"Funding" = "https://www.softwareheritage.org/donate"
"Documentation" = "https://docs.softwareheritage.org/devel/swh-vault/"
"Source" = "https://gitlab.softwareheritage.org/swh/devel/swh-vault.git"
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
[tool.setuptools_scm]
fallback_version = "0.0.1"
[tool.black]
target-version = ['py37']
target-version = ['py310', 'py311', 'py312']
[tool.isort]
multi_line_output = 3
......@@ -9,3 +65,38 @@ use_parentheses = true
ensure_newline_before_comments = true
line_length = 88
force_sort_within_sections = true
known_first_party = ['swh']
[tool.mypy]
namespace_packages = true
warn_unused_ignores = true
explicit_package_bases = true
# ^ Needed for mypy to detect py.typed from swh packages installed
# in editable mode
plugins = []
# 3rd party libraries without stubs (yet)
[[tool.mypy.overrides]]
module = [
"backports.entry_points_selectable.*",
"fastimport.*",
]
ignore_missing_imports = true
[tool.flake8]
select = ["C", "E", "F", "W", "B950"]
ignore = [
"E203", # whitespaces before ':' <https://github.com/psf/black/issues/315>
"E231", # missing whitespace after ','
"E501", # line too long, use B950 warning from flake8-bugbear instead
"W503", # line break before binary operator <https://github.com/psf/black/issues/52>
"E704", # multiple statements on one line (def)
]
max-line-length = 88
[tool.pytest.ini_options]
norecursedirs = "build docs .*"
asyncio_mode = "strict"
consider_namespace_packages = true
markers = ["graph: execute tests that depend on swh-graph"]
pytest.ini deleted 100644 → 0
View file @ 348b6e09
[pytest]
norecursedirs = build docs .*
markers =
graph: execute tests that depend on swh-graph
asyncio_mode = strict
requirements-swh.txt
View file @ 9dd1fd8d
swh.core[db,http] >= 2
swh.model >= 6
swh.objstorage >= 2
swh.scheduler >= 1.2
swh.storage >= 1.3
swh.core[db,http] >= 4.0.0
swh.model >= 6.13.0
swh.objstorage >= 2.3.0
swh.scheduler >= 3.0.0
swh.storage >= 3.0.0
requirements-test.txt
View file @ 9dd1fd8d
attrs
backports.entry_points_selectable
celery-types
dulwich >= 0.18.7
pytest
pytest >= 8.1
pytest-httpserver
pytest-mock
requests-mock
swh.core[testing] >= 4.0.0
swh.loader.core
swh.loader.git >= 0.8
swh.storage[testing]
swh.storage[pytest] >= 3.1.0
types-click
types-python-dateutil
types-pyyaml
......
setup.cfg deleted 100644 → 0
View file @ 348b6e09
[flake8]
# E203: whitespaces before ':' <https://github.com/psf/black/issues/315>
# E231: missing whitespace after ','
# E501: line too long, use B950 warning from flake8-bugbear instead
# W503: line break before binary operator <https://github.com/psf/black/issues/52>
select = C,E,F,W,B950
ignore = E203,E231,E501,W503
max-line-length = 88
setup.py deleted 100755 → 0
View file @ 348b6e09
#!/usr/bin/env python3
# Copyright (C) 2015-2020 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
from io import open
from os import path
from setuptools import find_packages, setup
here = path.abspath(path.dirname(__file__))
# Get the long description from the README file
with open(path.join(here, "README.rst"), encoding="utf-8") as f:
long_description = f.read()
def parse_requirements(name=None):
if name:
reqf = "requirements-%s.txt" % name
else:
reqf = "requirements.txt"
requirements = []
if not path.exists(reqf):
return requirements
with open(reqf) as f:
for line in f.readlines():
line = line.strip()
if not line or line.startswith("#"):
continue
requirements.append(line)
return requirements
setup(
name="swh.vault",
description="Software Heritage vault",
long_description=long_description,
long_description_content_type="text/x-rst",
python_requires=">=3.7",
author="Software Heritage developers",
author_email="swh-devel@inria.fr",
url="https://forge.softwareheritage.org/diffusion/DVAU/",
packages=find_packages(),
install_requires=parse_requirements() + parse_requirements("swh"),
setup_requires=["setuptools-scm"],
use_scm_version=True,
extras_require={
"testing": parse_requirements("test"),
"graph": parse_requirements("swh-graph"),
},
include_package_data=True,
zip_safe=False,
entry_points="""
[swh.cli.subcommands]
vault=swh.vault.cli
""",
classifiers=[
"Programming Language :: Python :: 3",
"Intended Audience :: Developers",
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
"Operating System :: OS Independent",
"Development Status :: 5 - Production/Stable",
],
project_urls={
"Bug Reports": "https://forge.softwareheritage.org/maniphest",
"Funding": "https://www.softwareheritage.org/donate",
"Source": "https://forge.softwareheritage.org/source/swh-vault",
"Documentation": "https://docs.softwareheritage.org/devel/swh-vault/",
},
)