Skip to content

Commit

Permalink
Merge pull request #672 from tira-io/main
Browse files Browse the repository at this point in the history
update pyterrier-artifacts to main
  • Loading branch information
mam10eks authored Dec 10, 2024
2 parents 0719ce5 + c33da3f commit 71c710f
Show file tree
Hide file tree
Showing 18 changed files with 151 additions and 151 deletions.
25 changes: 0 additions & 25 deletions application/Dockerfile.application

This file was deleted.

59 changes: 0 additions & 59 deletions application/src/tira_nginx.conf

This file was deleted.

11 changes: 0 additions & 11 deletions application/src/uwsgi.ini

This file was deleted.

17 changes: 0 additions & 17 deletions application/src/uwsgi_params

This file was deleted.

57 changes: 30 additions & 27 deletions documentation/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,16 @@
#
import os
import sys
sys.path.insert(0, os.path.abspath('../'))

sys.path.insert(0, os.path.abspath("./sphinxext"))
sys.path.insert(0, os.path.abspath("../"))


# -- Project information -----------------------------------------------------

project = 'TIRA'
copyright = '2024, Webis'
author = 'Webis'
project = "TIRA"
copyright = "2024, Webis"
author = "Webis"


# -- General configuration ---------------------------------------------------
Expand All @@ -28,42 +30,43 @@
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.todo',
'sphinx.ext.doctest',
'sphinx.ext.viewcode',
'sphinx_design',
'sphinxcontrib.plantuml',
'sphinxcontrib.umlet',
'myst_parser',
"sphinx.ext.autodoc",
"sphinx.ext.todo",
"sphinx.ext.doctest",
"sphinx.ext.viewcode",
"sphinx_design",
"sphinxcontrib.plantuml",
"sphinxcontrib.umlet",
"myst_parser",
"openapi",
]

todo_include_todos=True
python_display_short_literal_types=True
python_use_unqualified_type_names=True
viewcode_line_numbers=True
todo_include_todos = True
python_display_short_literal_types = True
python_use_unqualified_type_names = True
viewcode_line_numbers = True

doctest_global_setup = '''
doctest_global_setup = """
from tira.io_utils import *
'''
"""

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
templates_path = ["_templates"]

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]


# -- Options for HTML output -------------------------------------------------

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'furo'
html_title = 'TIRA'
language = 'en'
html_theme = "furo"
html_title = "TIRA"
language = "en"

html_logo = "https://assets.tira.io/tira-icons/tira-logo.svg"
html_theme_options: Dict[str, Any] = {
Expand All @@ -87,15 +90,15 @@
}


plantuml_output_format = 'svg_img'
plantuml_output_format = "svg_img"

umlet_binary_path = "/usr/share/umlet/Umlet/umlet.sh"

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
html_static_path = ["_static"]

html_css_files = [
'custom.css',
]
"custom.css",
]
12 changes: 9 additions & 3 deletions documentation/development/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ Removed



Alpha
-----
- Initial release




0.0.136
-------
For more information, we refer to the `Release Page <https://github.com/tira-io/tira/releases/tag/0.0.136>`_.

- First Release using the Release Pipeline
2 changes: 1 addition & 1 deletion documentation/development/devenvironment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ The development environment is quite similar to the production environment and c
.. umlet-figure:: images/devenv.uxf

Lookup Tables for Useful Information
-----------------------------------
------------------------------------
Root Password
~~~~~~~~~~~~~
You may occasionally need root privileges in the development container. The password for the root user is ``1234`` (if
Expand Down
4 changes: 2 additions & 2 deletions documentation/development/documentation.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Documentation
=============
Adding Documentation
====================
General
-------
All files relevant to TIRA's documentation can be found in the `documentation` subdirectory of the
Expand Down
4 changes: 2 additions & 2 deletions documentation/development/specification/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Specification
:link-type: doc

.. grid-item-card:: :octicon:`broadcast` REST API
:link: restapi
:link: restapi/index
:link-type: doc

.. grid-item-card:: :octicon:`plug` Technology
Expand All @@ -28,5 +28,5 @@ Specification

userstories
architecture
restapi
restapi/index
technology/index
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
REST-API
===================

Guidelines
----------

Expand Down
12 changes: 12 additions & 0 deletions documentation/development/specification/restapi/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
REST-API
========

.. toctree::
:maxdepth: 2
:glob:
:hidden:

*

.. include-openapi:: ./development/specification/rest-api.yml
:filter-tags: v1
5 changes: 4 additions & 1 deletion documentation/development/specification/technology/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ Technology

Other Resources
---------------
* `Semantic Versioning <https://semver.org>`_
* `Semantic Versioning <https://semver.org>`_
* :RFC:`3986` -- URI Syntax (esp. Section 3)
* :RFC:`4395` -- Registration Guidelines for new URI Schemes
* :RFC:`8615` -- ``/.well-known`` URIs
1 change: 1 addition & 0 deletions documentation/organizers/intro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,5 @@ How do I...

.. _orgfaq:
.. rubric:: Frequently Asked Questions

No questions yet :material-regular:`mood;1.5em;sd-text-success`.
2 changes: 2 additions & 0 deletions documentation/participants/participate.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Participating in a Shared Task


.. _JoinTask:

Joining a Task and preparing your Environment
---------------------------------------------

Expand Down Expand Up @@ -59,6 +60,7 @@ out more):


.. _SubmitSubmission:

Submitting your Submission
--------------------------
At this point, you came up with a brilliant idea and would like to submit it to TIRA for evaluation and to take pride in
Expand Down
Loading

0 comments on commit 71c710f

Please sign in to comment.