Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix doi citation #228

Merged
merged 4 commits into from
Oct 4, 2023
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
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3.10"
python: "3.11"

jobs:
pre_build:
Expand Down
7 changes: 5 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,8 @@ license: MIT
identifiers:
- description: This is the collection of archived snapshots of all versions of PedPy
type: doi
value: "10.5281/zenodo.8254431"
version: 1.0.0rc3
value: "10.5281/zenodo.7194992"
- description: This is the archived snapshot of version 1.0.0 of PedPy
type: doi
value: "10.5281/zenodo.8405437"
version: 1.0.1
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[![PyPI Latest Release](https://img.shields.io/pypi/v/pedpy.svg)](https://pypi.org/project/pedpy/)
[![Nightly Release](https://img.shields.io/badge/nightly-install-9cf)](https://test.pypi.org/project/PedPy/)
![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pedpy)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7386931.svg)](https://doi.org/10.5281/zenodo.7386931)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7194992.svg)](https://doi.org/10.5281/zenodo.7194992)
[![License](https://img.shields.io/pypi/l/pedpy.svg)](https://github.com/PedestrianDynamics/pedpy/blob/main/LICENSE)
![ci workflow](https://github.com/PedestrianDynamics/pedestrian-trajectory-analyzer/actions/workflows/ci.yml/badge.svg)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
Expand All @@ -23,7 +23,7 @@ It implements different measurement methods for density, velocity and flow.

If you use *PedPy* in your work, please cite it using the following information from zenodo:

[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7386931.svg)](https://doi.org/10.5281/zenodo.7386931)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7194992.svg)](https://doi.org/10.5281/zenodo.7194992)


## Getting started
Expand Down
10 changes: 5 additions & 5 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
sphinx~=5.3.0
sphinx~=6.2.1
sphinx-copybutton==0.5.2
sphinx_design==0.5.0
myst-nb==0.17.2
nbconvert==7.7.1
sphinx-notfound-page==0.8.3
myst-nb @ git+https://github.com/executablebooks/MyST-NB@59854c2
nbconvert==7.9.0
sphinx-notfound-page==1.0.0
sphinx-favicon==1.0.1
sphinx-book-theme==1.0.1
sphinx-autoapi==2.1.1
sphinx-autoapi==3.0.0
h5py~=3.9.0
tables~=3.8.0
15 changes: 15 additions & 0 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
*********
Changelog
*********

Version 1.0.1 (2023-10-04)
==========================

Fixes:

- Add correct doi badge to documentation and readme

Version 1.0.0 (2023-09-22)
==========================

First release of *PedPy*.
13 changes: 10 additions & 3 deletions docs/source/citation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,16 @@
Cite PedPy
**********

If you use *PedPy* in your work, please cite it using the following information from zenodo:
If you use *PedPy* in your work, please cite it using the following information from zenodo.
Here you can find all versions of PedPy with this link:

.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.8254431.svg
:target: https://doi.org/10.5281/zenodo.8254431
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.7194992.svg
:target: https://doi.org/10.5281/zenodo.7194992

You can find out the installed version of *PedPy* with:

.. code-block:: bash

import pedpy
print(pedpy.__version__)

4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@
},
{
"name": "DOI",
"url": "https://doi.org/10.5281/zenodo.8254431",
"icon": "https://zenodo.org/badge/DOI/10.5281/zenodo.8254431.svg",
"url": "https://doi.org/10.5281/zenodo.7194992",
"icon": "https://zenodo.org/badge/DOI/10.5281/zenodo.7194992.svg",
"type": "url",
},
],
Expand Down
1 change: 1 addition & 0 deletions docs/source/developer_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ So don't hesitate to reach out with any questions or ideas you may have. We look

Reporting bugs
==============

At *PedPy*, we value feedback from our users, and we encourage you to report any issues or bugs that you encounter while using the library.
You can do this by visiting our `GitHub issues page <https://github.com/PedestrianDynamics/PedPy/issues>`_.
From there, you can submit a new issue, provide a detailed description of the problem, and even include code snippets or screenshots to help us better understand the issue.
Expand Down
15 changes: 12 additions & 3 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ PedPy: Pedestrian Trajectory Analyzer
API Reference <api/index>
Developer Guide <developer_guide>
Cite PedPy <citation>
Changelog <changelog>
Disclaimer <disclaimer>


Expand Down Expand Up @@ -38,10 +39,18 @@ Install PedPy
Cite PedPy
==========

If you use *PedPy* in your work, please cite it using the following information from zenodo:
If you use *PedPy* in your work, please cite it using the following information from zenodo.
Here you can find all versions of PedPy with this link:

.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.8254431.svg
:target: https://doi.org/10.5281/zenodo.8254431
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.7194992.svg
:target: https://doi.org/10.5281/zenodo.7194992

You can find out the installed version of *PedPy* with:

.. code-block:: bash

import pedpy
print(pedpy.__version__)

|

Expand Down
1 change: 0 additions & 1 deletion pedpy/column_identifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from typing import Final

# TrajectoryData
ID_COL: Final = "id"
FRAME_COL: Final = "frame"
X_COL: Final = "x"
Expand Down
1 change: 1 addition & 0 deletions pedpy/methods/speed_calculator.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ def compute_individual_speed(
This then can be used to compute the speed with:

.. math::

\bar{X} = X_{future} - X_{past}


Expand Down