Skip to content

chore: move over final doc and src files #163

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

Closed
wants to merge 2 commits into from
Closed
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
6 changes: 4 additions & 2 deletions doc/source/api/diffpy.srmise.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
:tocdepth: -1

diffpy.srmise package
=====================
|title|
=======

.. |title| replace:: diffpy.srmise package

.. automodule:: diffpy.srmise
:members:
Expand Down
45 changes: 39 additions & 6 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# diffpy.srmise documentation build configuration file, created by
# diffpy.srmise documentation build configuration file, created by # noqa: E501
# sphinx-quickstart on Thu Jan 30 15:49:41 2014.
#
# This file is execfile()d with the current directory set to its
Expand All @@ -18,15 +18,21 @@
from importlib.metadata import version
from pathlib import Path

# Attempt to import the version dynamically from GitHub tag.
try:
fullversion = version("diffpy.srmise")
except Exception:
fullversion = "No version found. The correct version will appear in the released version." # noqa: E501

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use Path().resolve() to make it absolute, like shown here.
# documentation root, use Path().resolve() to make it absolute, like shown here. # noqa: E501
# sys.path.insert(0, str(Path(".").resolve()))
sys.path.insert(0, str(Path("../..").resolve()))
sys.path.insert(0, str(Path("../../src").resolve()))

# abbreviations
ab_authors = "Billinge Group members and community contributors"
ab_authors = "Luke Granlund, Billinge Group members"

# -- General configuration ------------------------------------------------

Expand All @@ -43,6 +49,7 @@
"sphinx.ext.viewcode",
"sphinx.ext.intersphinx",
"sphinx_rtd_theme",
"sphinx_copybutton",
"m2r",
]

Expand All @@ -68,7 +75,6 @@
# |version| and |release|, also used in various other places throughout the
# built documents.

fullversion = version(project)
# The short X.Y version.
version = "".join(fullversion.split(".post")[:1])
# The full version, including alpha/beta/rc tags.
Expand All @@ -88,6 +94,11 @@
# substitute YEAR in the copyright string
copyright = copyright.replace("%Y", year)

# For sphinx_copybutton extension.
# Do not copy "$" for shell commands in code-blocks.
copybutton_prompt_text = r"^\$ "
copybutton_prompt_is_regexp = True

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = ["build"]
Expand Down Expand Up @@ -123,6 +134,14 @@
#
html_theme = "sphinx_rtd_theme"

html_context = {
"display_github": True,
"github_user": "diffpy",
"github_repo": "diffpy.srmise",
"github_version": "main",
"conf_py_path": "/doc/source/",
}

# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
Expand Down Expand Up @@ -221,7 +240,13 @@
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
("index", "diffpy.srmise.tex", "diffpy.srmise Documentation", ab_authors, "manual"),
(
"index",
"diffpy.srmise.tex",
"diffpy.srmise Documentation",
ab_authors,
"manual",
),
]

# The name of an image file (relative to this directory) to place at the top of
Expand Down Expand Up @@ -249,7 +274,15 @@

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [("index", "diffpy.srmise", "diffpy.srmise Documentation", ab_authors, 1)]
man_pages = [
(
"index",
"diffpy.srmise",
"diffpy.srmise Documentation",
ab_authors,
1,
)
]

# If true, show URL addresses after external links.
# man_show_urls = False
Expand Down
29 changes: 19 additions & 10 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,24 @@

.. |title| replace:: diffpy.srmise documentation

diffpy.srmise - Peak extraction and peak fitting tool for atomic pair distribution functions..
``diffpy.srmise`` - Peak extraction and peak fitting tool for atomic pair distribution functions.

| Software version |release|.
| Software version |release|
| Last updated |today|.

===============
Getting started
===============

Welcome to the ``diffpy.srmise`` documentation!

To get started, please visit the :ref:`Getting started <getting-started>` page.

=======
Authors
=======

diffpy.srmise is developed by Billinge Group
and its community contributors.

For a detailed list of contributors see
``diffpy.srmise`` is developed by Luke Granlund, Billinge Group members. The maintainer for this project is Simon Billinge. For a detailed list of contributors see
https://github.com/diffpy/diffpy.srmise/graphs/contributors.

============
Expand All @@ -26,15 +31,19 @@ Installation
See the `README <https://github.com/diffpy/diffpy.srmise#installation>`_
file included with the distribution.

================
Acknowledgements
================

``diffpy.srmise`` is built and maintained with `scikit-package <https://scikit-package.github.io/scikit-package/>`_.

=================
Table of contents
=================
.. toctree::
:maxdepth: 1
:titlesonly:
:maxdepth: 2

tutorial/index
extending
getting-started
Package API <api/diffpy.srmise>
release
license
Expand Down
2 changes: 1 addition & 1 deletion doc/source/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ BSD 3-Clause License

Copyright 2014-2015, Board of Trustees of Michigan State University

Copyright 2016-2024, The Trustees of Columbia University in the City of New York.
Copyright 2016-2025, The Trustees of Columbia University in the City of New York.

All rights reserved.

Expand Down
11 changes: 1 addition & 10 deletions src/diffpy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
##############################################################################
#
# (c) 2024 The Trustees of Columbia University in the City of New York.
# (c) 2025 The Trustees of Columbia University in the City of New York.
# All rights reserved.
#
# File coded by: Billinge Group members and community contributors.
Expand All @@ -12,12 +12,3 @@
# See LICENSE.rst for license information.
#
##############################################################################

"""Blank namespace package for module diffpy."""


from pkgutil import extend_path

__path__ = extend_path(__path__, __name__)

# End of file
5 changes: 2 additions & 3 deletions src/diffpy/srmise/__init__.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
#!/usr/bin/env python
##############################################################################
#
# (c) 2024 The Trustees of Columbia University in the City of New York.
# (c) 2025 The Trustees of Columbia University in the City of New York.
# All rights reserved.
#
# File coded by: Billinge Group members and community contributors.
# File coded by: Luke Granlund, Billinge Group members.
#
# See GitHub contributions for a more detailed list of contributors.
# https://github.com/diffpy/diffpy.srmise/graphs/contributors
#
# See LICENSE.rst for license information.
#
##############################################################################

"""Peak extraction and peak fitting tool for atomic pair distribution functions."""

# package version
Expand Down
5 changes: 2 additions & 3 deletions src/diffpy/srmise/version.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
#!/usr/bin/env python
##############################################################################
#
# (c) 2024 The Trustees of Columbia University in the City of New York.
# (c) 2025 The Trustees of Columbia University in the City of New York.
# All rights reserved.
#
# File coded by: Billinge Group members and community contributors.
# File coded by: Luke Granlund, Billinge Group members.
#
# See GitHub contributions for a more detailed list of contributors.
# https://github.com/diffpy/diffpy.srmise/graphs/contributors
#
# See LICENSE.rst for license information.
#
##############################################################################

"""Definition of __version__."""

# We do not use the other three variables, but can be added back if needed.
Expand Down