Skip to content

Commit

Permalink
deploy: 43b6e42
Browse files Browse the repository at this point in the history
  • Loading branch information
edwardchalstrey1 committed Oct 24, 2024
0 parents commit b139bb8
Show file tree
Hide file tree
Showing 535 changed files with 245,503 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .buildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 18315ea683e9dd40252ecdf618a5eb4d
tags: 645f666f9bcd5a90fca523b33c5a78b7
Binary file added .doctrees/admin/backup.doctree
Binary file not shown.
Binary file added .doctrees/admin/bulk_updates.doctree
Binary file not shown.
Binary file added .doctrees/admin/developers-guide.doctree
Binary file not shown.
Binary file added .doctrees/admin/django.doctree
Binary file not shown.
Binary file added .doctrees/admin/index.doctree
Binary file not shown.
Binary file added .doctrees/admin/repo_structure.doctree
Binary file not shown.
Binary file added .doctrees/admin/schema.doctree
Binary file not shown.
Binary file added .doctrees/admin/setup/cloud/CSH_manual.doctree
Binary file not shown.
Binary file added .doctrees/admin/setup/cloud/pulumi.doctree
Binary file not shown.
Binary file added .doctrees/admin/setup/index.doctree
Binary file not shown.
Binary file added .doctrees/admin/setup/local/index.doctree
Binary file not shown.
Binary file added .doctrees/admin/setup/local/macos-ubuntu.doctree
Binary file not shown.
Binary file added .doctrees/admin/setup/local/macos.doctree
Binary file not shown.
Binary file added .doctrees/admin/setup/local/ubuntu.doctree
Binary file not shown.
Binary file added .doctrees/admin/setup/local/windows.doctree
Binary file not shown.
Binary file added .doctrees/admin/setup/spatialdb.doctree
Binary file not shown.
Binary file added .doctrees/admin/testing.doctree
Binary file not shown.
Binary file added .doctrees/admin/websites.doctree
Binary file not shown.
Binary file added .doctrees/api/custom_filters/index.doctree
Binary file not shown.
Binary file added .doctrees/api/index.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/accounts/index.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/core/apps/index.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/core/index.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/core/urls/index.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/crisisdb/index.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/general/index.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/rt/admin/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/rt/apps/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/rt/forms/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/rt/index.doctree
Binary file not shown.
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/rt/tests/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/rt/urls/index.doctree
Binary file not shown.
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/rt/views/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/sc/admin/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/sc/apps/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/sc/forms/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/sc/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/sc/models/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/sc/tests/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/sc/urls/index.doctree
Binary file not shown.
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/sc/views/index.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/wf/admin/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/wf/apps/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/wf/forms/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/wf/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/wf/models/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/wf/tests/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/wf/urls/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/apps/wf/views/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/asgi/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/settings/base/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/settings/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/settings/local/index.doctree
Binary file not shown.
Binary file not shown.
Binary file added .doctrees/api/seshat/urls/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/utils/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/utils/utils/index.doctree
Binary file not shown.
Binary file added .doctrees/api/seshat/wsgi/index.doctree
Binary file not shown.
Binary file added .doctrees/code-of-conduct.doctree
Binary file not shown.
Binary file added .doctrees/environment.pickle
Binary file not shown.
Binary file added .doctrees/expert/index.doctree
Binary file not shown.
Binary file added .doctrees/how-to-update-these-docs.doctree
Binary file not shown.
Binary file added .doctrees/index.doctree
Binary file not shown.
Binary file added .doctrees/public_user/index.doctree
Binary file not shown.
Binary file added .doctrees/researcher/api.doctree
Binary file not shown.
Binary file added .doctrees/researcher/cliopatria.doctree
Binary file not shown.
Binary file added .doctrees/researcher/datasets.doctree
Binary file not shown.
Binary file added .doctrees/researcher/getting_started.doctree
Binary file not shown.
Binary file added .doctrees/researcher/index.doctree
Binary file not shown.
Binary file added .doctrees/researcher/projects.doctree
Binary file not shown.
Binary file added .doctrees/resources.doctree
Binary file not shown.
Binary file added .doctrees/software-tools.doctree
Binary file not shown.
Binary file added .doctrees/team.doctree
Binary file not shown.
Empty file added .nojekyll
Empty file.
Binary file added _images/basic_github_workflow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _images/comments.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _images/edit_cliopatria.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _images/edit_cliopatria_part_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _images/edit_polity.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _images/edit_var.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _images/notifications.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _images/pg_hba.conf.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _images/private_comment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _images/set_done.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions _sources/admin/backup.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Database backups
===============

The current process for backing up the Seshat database is as follows:

1. ssh into the server hosting the database e.g. `seshat-db.com` (see `websites <websites.rst>`_):

.. code-block:: bash
ssh user@server
2. Create a dumpfile backup of the PostgreSQL database, where `<seshat_db_name>` is the name of the database and `<date>` is the current date:

.. code-block:: bash
pg_dump -U postgres -d <seshat_db_name> > backup_<date>.dump
3. Download the dumpfile to your local machine:

.. code-block:: bash
scp user@server:/path/to/backup_<date>.dump /path/to/backup_<date>.dump
4. Upload the dumpfile to this `google drive folder <https://drive.google.com/drive/folders/1c5djM48ve91t84Ug4a8JksSC0p4J-eav?usp=sharing>`_.
4 changes: 4 additions & 0 deletions _sources/admin/bulk_updates.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Adding new datasets to the Seshat database
========================================

...
126 changes: 126 additions & 0 deletions _sources/admin/developers-guide.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
Developer's Guide
=================

The Seshat project is open source and welcomes contributions from developers. This guide is written for the core project maintainers working at the Complexity Science Hub in Vienna and The Alan Turing Institute in London.

Getting started
---------------

1. If you are a core developer on the Seshat project, ensure you are a maintainer of the Seshat repository, found at `Seshat-Global-History-Databank/seshat <https://github.com/Seshat-Global-History-Databank/seshat>`_.

- Ask an existing maintainer to add you if you are not already a maintainer.
- If you are not a core developer, you can still contribute by forking the repository and submitting pull requests from there.

2. Follow the instructions in the `Setting up Seshat in a local environment <../getting-started/setup/local/index.rst>`_ guide to set up your local development environment.

3. Review the Seshat development project board on `GitHub <https://github.com/orgs/Seshat-Global-History-Databank/projects/1/views/1>`_.

- The project board is used to track the progress of issues and pull requests.
- The board is divided into columns for each stage of the development process, such as "To do", "In progress", and "Done".

4. Assign yourself to issues you intend to work on.

- This helps to prevent multiple people working on the same issue at the same time.
- Place an issue in the "In progress" column if you are actively working on it.
- Otherwise order your assigned issues in the "To do" column by priority.

5. Create new issues for upcoming development tasks `here <https://github.com/Seshat-Global-History-Databank/seshat/issues>`_ and add them to the project board. There are issue templates set up for:

- Bug reports
- Feature requests
- Documentation improvements

Development workflow
--------------------

1. Select an issue to work on from the Seshat development project board on `GitHub <https://github.com/orgs/Seshat-Global-History-Databank/projects/1/views/1>`_, or create a new issue as described above.

- Assign the issue to yourself.
- Move the issue to the "In progress" column on the project board.

2. Create a new branch from the `dev` branch.

- You should have cloned the Seshat repository to your local machine when setting up your development environment. See `Setting up Seshat in a local environment <../getting-started/setup/local/index.rst>`_ for more information on running the Seshat application locally.
- Ensure you have run `git pull` to get the latest changes from the `dev` branch.
- Create a new branch for your changes based on the `dev` branch. The branch name could be descriptive of the issue you are working on, e.g. `fix-1234` or `feature-5678`.

3. Implement your code changes.

- Commit each change with a descriptive commit message.
- Push your branch to GitHub as you work on it or when you have completed the changes.

4. Test your changes locally.

- Ensure your changes work as expected in your local development environment.
- If you have added new migrations, apply them to the database.
- [Optional] Add tests if appropriate.
- [Optional] You can run tests locally to ensure your changes do not break existing functionality. See the `Testing <testing.rst>`_ guide for more information. Tests will also be run automatically on GitHub actions when you open a pull request.

5. [Optional] Test your changes on the staging server if needed.

- *ssh* into the staging server. See `websites <websites.rst>`_ for details on current servers maintained by the project.
- Run `git fetch` and then `git checkout <new branch name>`.
- You may also need to restart Gunicorn to see the changes. See the `setup docs <setup/index.rst>`_ for guidance.
- If you have added new migrations, apply them to the database.
- Make sure your changes work as expected on the staging server.

6. Open a pull request on GitHub.

- On GitHub, open a pull request from the new branch to the `dev` branch. Make sure the base repository is set to `Seshat-Global-History-Databank/seshat`.
- Add a descriptive title and description to the pull request.
- You can include "Closes #<issue number>" in the pull request description if you want to automatically close the issue when the pull request is merged.
- [Optional] Assign the pull request to maintainer(s) for review if needed.

7. Review and address any feedback or problems on the pull request.

- If any of the GitHub actions fail, check the logs to see what went wrong. You may need to make changes to your code and push them to the branch.
- If reviewers have added comments, make changes to your code based on the feedback, adding new commits to the branch and pushing them to the remote repository.
- Once the feedback is addressed, request a review from the maintainer(s) again.

8. Once your pull request is ready (and approved by any reviewers), it can be merged into the `dev` branch.

- Remember to close the issue associated with the pull request manually if it wasn't already closed by the merge.
- The closed issue will be automatically moved to the "Done" column on the project board.

9. Pull the latest changes from the `dev` branch to the production server hosting the Seshat website.

- *ssh* into the production server. See `websites <websites.rst>`_ for details on current servers maintained by the project.
- Ensure any new migrations are applied to the database.
- You may also need to restart Gunicorn to see the changes. See the `setup docs <setup/index.rst>`_ for guidance.


GitHub workflow visualised
---------------------------

As described above, development on Seshat follows a basic GitHub workflow. The diagram below illustrates the steps involved in the process, from selecting an issue to merging a pull request. Note that the master branch is called `dev` in the Seshat repository. Feature branches should be named appropriately based on the issue they are addressing.


.. image:: ../img/basic_github_workflow.png
:alt: Seshat development workflow

Image taken from `The GitHub Flow <https://guides.github.com/introduction/flow/>`_ by Dev Genius

Updating this documentation
---------------------------

If you are making changes to the Seshat project that require updates to the documentation, you can do so by following these steps:

1. [Optional] Follow the developers guide above and open a GitHub issue using the *Documentation Improvement* template.

2. Make your changes to the documentation in the `docs/source` directory. The pages are written in reStructuredText format.

3. Build the documentation locally to check that your changes are rendering correctly.

.. code-block:: bash
pip install -r docs/requirements.txt
cd docs
make html
4. In your browser, open the `docs/build/html/index.html` file to view the updated documentation.

5. Make a pull request with your changes to the `dev` branch. Follow the steps in the *Development workflow* section above.

6. GitHub actions will automatically build the documentation when you open a pull request. Fix any errors that are flagged.

7. Once your pull request is merged, the documentation will be automatically updated on the `Seshat documentation site <https://seshat-documentation.readthedocs.io/en/latest/>`_.
4 changes: 4 additions & 0 deletions _sources/admin/django.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Using Django in Seshat
======================

...
25 changes: 25 additions & 0 deletions _sources/admin/index.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Seshat Databank Admin
=====================

This section of the documentation is for the Seshat Databank Admins: members of the Seshat team responsible for the maintenance and development of the Seshat codebase, database and website.

If you are new to the Seshat project, you should review these pages, in particular the Getting Started section of the Developers Guide.

You may also wish to review the `team <../team.rst>`_ page, which includes a help section, to see who on the Seshat team can help you with various tasks.

.. toctree::
:maxdepth: 3

developers-guide
repo_structure
django
bulk_updates
backup
schema
testing
websites
setup/index




4 changes: 4 additions & 0 deletions _sources/admin/repo_structure.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Seshat Github repo structure
============================

...
4 changes: 4 additions & 0 deletions _sources/admin/schema.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Database schema map
===================

...
Loading

0 comments on commit b139bb8

Please sign in to comment.