Skip to content
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
=============
Release Notes
Release notes
=============

.. current developments
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Our Pledge
We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
identity and expression, level of experience, education, socioeconomic status,
nationality, personal appearance, race, caste, color, religion, or sexual
identity and orientation.

Expand Down
13 changes: 9 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
:target: https://diffpy.github.io/diffpy.pdfgui
:height: 100px

|PyPi| |Forge| |PythonVersion| |PR|
|PyPI| |Forge| |PythonVersion| |PR|

|CI| |Codecov| |Black| |Tracking|

Expand All @@ -26,7 +26,7 @@

.. |PR| image:: https://img.shields.io/badge/PR-Welcome-29ab47ff

.. |PyPi| image:: https://img.shields.io/pypi/v/diffpy.pdfgui
.. |PyPI| image:: https://img.shields.io/pypi/v/diffpy.pdfgui
:target: https://pypi.org/project/diffpy.pdfgui/

.. |PythonVersion| image:: https://img.shields.io/pypi/pyversions/diffpy.pdfgui
Expand All @@ -35,7 +35,7 @@
.. |Tracking| image:: https://img.shields.io/badge/issue_tracking-github-blue
:target: https://github.com/diffpy/diffpy.pdfgui/issues

Graphical user interface program for structure refinements to atomic
Graphical user interface program for structure refinements to the atomic
pair distribution function.

For users who do not have the expertise or necessity for command
Expand Down Expand Up @@ -167,4 +167,9 @@ Before contributing, please read our `Code of Conduct <https://github.com/diffpy
Contact
-------

For more information on diffpy.pdfgui please visit the project `web-page <https://diffpy.github.io/>`_ or email Prof. Simon Billinge at sb2896@columbia.edu.
For more information on diffpy.pdfgui please visit the project `web-page <https://diffpy.github.io/>`_ or email Simon Billinge at sb2896@columbia.edu.

Acknowledgements
----------------

``diffpy.pdfgui`` is built and maintained with `scikit-package <https://scikit-package.github.io/scikit-package/>`_.
31 changes: 31 additions & 0 deletions doc/source/api/diffpy.pdfgui.example_package.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
.. _example_package documentation:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ycexiao sorry I missed this stub file too. This needs to be deleted.


|title|
=======

.. |title| replace:: diffpy.pdfgui.example_package package

.. automodule:: diffpy.pdfgui.example_package
:members:
:undoc-members:
:show-inheritance:

|foo|
-----

.. |foo| replace:: diffpy.pdfgui.example_package.foo module

.. automodule:: diffpy.pdfgui.example_package.foo
:members:
:undoc-members:
:show-inheritance:

|bar|
-----

.. |bar| replace:: diffpy.pdfgui.example_package.bar module

.. automodule:: diffpy.pdfgui.example_package.foo
:members:
:undoc-members:
:show-inheritance:
40 changes: 37 additions & 3 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
# All configuration values have a default; values that are commented out
# serve to show the default.

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

import sys
import time
from importlib.metadata import version
Expand Down Expand Up @@ -42,6 +48,7 @@
"sphinx.ext.todo",
"sphinx.ext.viewcode",
"sphinx.ext.intersphinx",
"sphinx_copybutton",
"sphinx_rtd_theme",
"m2r",
]
Expand All @@ -64,6 +71,11 @@
project = "diffpy.pdfgui"
copyright = "%Y, The Trustees of Columbia University in the City of New York"

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

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
Expand Down Expand Up @@ -123,6 +135,14 @@
#
html_theme = "sphinx_rtd_theme"

html_context = {
"display_github": True,
"github_user": "diffpy",
"github_repo": "diffpy.pdfgui",
"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 @@ -158,7 +178,7 @@
# Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied
# directly to the root of the documentation.
html_extra_path = ["../manual"]
html_extra_path = []

# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
Expand Down Expand Up @@ -221,7 +241,13 @@
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
("index", "diffpy.pdfgui.tex", "diffpy.pdfgui Documentation", ab_authors, "manual"),
(
"index",
"diffpy.pdfgui.tex",
"diffpy.pdfgui 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 +275,15 @@

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

# If true, show URL addresses after external links.
# man_show_urls = False
Expand Down
79 changes: 79 additions & 0 deletions doc/source/getting-started.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
:tocdepth: -1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this entire file needs to be deleted. There is pdfgui documentation so we don't need this stub. Also the skpkg logo


.. index:: getting-started

.. _getting-started:

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

Here are some example templates provided to help you get started with writing your documentation. You can use these templates to create your own documentation.

Reuse ``.rst`` files across multiple pages
------------------------------------------

Here is how you can reuse a reusable block of ``.rst`` files across multiple pages:

.. include:: snippets/example-table.rst

.. warning::

Ensure that the ``.rst`` file you are including is not too long. If it is too long, it may be better to split it into multiple files and include them separately.

Refer to a specific section in the documentation
------------------------------------------------

You can use the ``ref`` tag to refer to a specific section in the documentation. For example, you can refer to the section below using the ``:ref:`` tag as shown :ref:`here <attach-image>`.

.. note::

Please check the raw ``.rst`` file of this page to see the exact use of the ``:ref:`` tag.

Embed your code snippets in the documentation
---------------------------------------------

Here is how you can write a block of code in the documentation. You can use the ``code-block`` directive to write a block of code in the documentation. For example, you can write a block of code as shown below:

.. code-block:: bash
# Create a new environment, without build dependencies (pure Python package)
conda create -n <package_name>-env python=3.13 \
--file requirements/test.txt \
--file requirements/conda.txt
# Create a new environment, with build dependencies (non-pure Python package)
conda create -n <package_name>-env python=3.13 \
--file requirements/test.txt \
--file requirements/conda.txt \
--file requirements/build.txt
# Activate the environment
conda activate <package_name>_env
# Install your package locally
# `--no-deps` to NOT install packages again from `requirements.pip.txt`
pip install -e . --no-deps
# Run pytest locally
pytest
# ... run example tutorials
.. _attach-image:

Attach an image to the documentation
------------------------------------

Here is how you attach an image to the documentation. The ``/doc/source/img/scikit-package-logo-text.png`` example image is provided in the template.

.. image:: ./img/scikit-package-logo-text.png
:alt: codecov-in-pr-comment
:width: 400px
:align: center


Other useful directives
-----------------------

Here is how you can do menu selection :menuselection:`Admin --> Settings` and display labels for buttons like :guilabel:`Privacy level`.
Binary file added doc/source/img/scikit-package-logo-text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
79 changes: 17 additions & 62 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,94 +4,49 @@

.. |title| replace:: diffpy.pdfgui documentation

diffpy.pdfgui - GUI for PDF simulation and structure refinement.
``diffpy.pdfgui`` - Graphical user interface program for structure refinements to atomic pair distribution function.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add "the" in here too


| Software version |release|
| Last updated |today|
| Last updated |today|.
For users who do not have the expertise or necessity for command
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep this

line analysis, PDFgui is a convenient and easy to use graphical front
end for the PDFfit2 refinement program. It is capable of full-profile
fitting of the atomic pair distribution function (PDF) derived from x-ray
or neutron diffraction data and comes with built in graphical and structure
visualization capabilities.
===============
Getting started
===============

PDFgui is a friendly interface to the PDFfit2 refinement engine, with many
powerful extensions. To get started, please open the :ref:`manual`
(:download:`pdf <pdfgui.pdf>`) from the help menu or follow the :ref:`tutorial`.
Welcome to the ``diffpy.pdfgui`` documentation!

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

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

DiffPy was initiated as part of the Distributed Data Analysis of Neutron
Scattering Experiments (DANSE) project, funded by the National Science
Foundation under grant DMR-0520547. Any opinions, findings, and conclusions or
recommendations expressed in this material are those of the author(s)
and do not necessarily reflect the views of the NSF.

The main contributors to this package were

Chris Farrow,
Jiwu Liu,
Pavol Juhas,
Dmitriy Bryndin

Other current and former contributors of the DiffPy project include

Simon Billinge,
Chris Farrow,
Emil Bozin,
Wenduo Zhou,
Peng Tian

The DiffPy team is part of the Billinge Group at Columbia University in New York,
within the Department of Applied Physics and Applied Mathematics.

For a detailed list of contributors see
``diffpy.pdfgui`` is developed by Simon J.L. Billinge group. The maintainer for this project is Simon J.L. Billinge group. For a detailed list of contributors see
https://github.com/diffpy/diffpy.pdfgui/graphs/contributors.

=========
Reference
=========

If you use this program for a scientific research that leads to publication,
we ask that you acknowledge use of the program by citing the following paper
in your publication:

C L Farrow, P Juhas, J W Liu, D Bryndin, E S Božin,
J Bloch, Th Proffen and S J L Billinge, `PDFfit2 and PDFgui:
computer programs for studying nanostructure in crystals <https://doi.org/10.1088/0953-8984/19/33/335219>`_,
J. Phys.: Condens. Matter 19 (2007) 335219.

============
Installation
============

See the `README <https://github.com/diffpy/diffpy.pdfgui#installation>`_
file included with the distribution.

========
Tutorial
========

The tutorial for the package can be found here:

.. toctree::
================
Acknowledgements
================

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

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

examples
extras
license
release
getting-started
Package API <api/diffpy.pdfgui>
release
license

=======
Indices
Expand Down
Loading
Loading