Skip to content

Commit

Permalink
Major new commit to overhaul documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewcarbone committed Nov 6, 2024
1 parent ea68213 commit 6ff650b
Show file tree
Hide file tree
Showing 29 changed files with 721 additions and 364 deletions.
6 changes: 6 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,19 @@ Maintainers and core contributors are listed below.

## Maintainers


<!--maintainers-start-->
[Matthew R. Carbone](https://matthewcarbone.dev/) (principal maintainer, Computational Science Initiative, Brookhaven National Laboratory; BNL) and [Fanchen Meng](https://www.linkedin.com/in/fanchen-meng-4956b1290/) are the maintainers of Lightshow.
<!--maintainers-end-->

## Core contributors

<!--contributors-start-->
- Deyu Lu (Center for Functional Nanomaterials, BNL)
- Benedikt Maurer (Physics Department and IRIS Adlershof, Humboldt-Universitaet zu Berlin)
- Fabian Peschel (Physics Department and IRIS Adlershof, Humboldt-Universitaet zu Berlin)
- Eli Stavitski (National Synchrotron Lightsource II, BNL)
- Xiaohui Qu (Center for Functional Nanomaterials, BNL)
- John T. Vinson (Material Measurement Laboratory, National Institute of Standards and Technology)
- Christian Vorwerk (Pritzker School of Molecular Engineering, University of Chicago)
<!--contributors-end-->
38 changes: 32 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
<div align="center">

![sysfs line plot](https://raw.githubusercontent.com/AI-multimodal/Lightshow/master/docs/_static/images/lightshow.jpg)
<!-- ![sysfs line plot](https://raw.githubusercontent.com/AI-multimodal/Lightshow/master/docs/_static/images/lightshow.jpg) -->

# Lightshow

<!--badges-start-->
[![image](https://joss.theoj.org/papers/a9cabcd7f4b85a926a797997c6622b43/status.svg)](https://joss.theoj.org/papers/a9cabcd7f4b85a926a797997c6622b43)
[![image](https://github.com/AI-multimodal/Lightshow/actions/workflows/ci.yml/badge.svg)](https://github.com/AI-multimodal/Lightshow/actions/workflows/ci.yml)
[![image](https://codecov.io/gh/AI-multimodal/Lightshow/branch/master/graph/badge.svg?token=CW7BMFA5O7)](https://codecov.io/gh/AI-multimodal/Lightshow)
[![image](https://app.codacy.com/project/badge/Grade/d31a4e18672c4d71bbaafa719181c140)](https://www.codacy.com/gh/AI-multimodal/Lightshow/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=AI-multimodal/Lightshow&amp;utm_campaign=Badge_Grade) <br>
[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
[![python](https://img.shields.io/badge/-Python_3.9+-blue?logo=python&logoColor=white)](https://github.com/pre-commit/pre-commit)
[![Downloads](https://static.pepy.tech/badge/lightshow)](https://pepy.tech/project/lightshow)
<!--badges-end-->
</div>


------------------------------------------------------------------------

<!--lightshow-intro-start-->
**Lightshow** is a Python library for easily generating computational
spectroscopy input files. If you use our code, please consider citing our [manuscript](https://doi.org/10.21105/joss.05182) in the Journal of Open Source Software and our multi-code benchmark [paper](https://doi.org/10.1103/PhysRevMaterials.8.013801), which provides the methods and default parameters used in Lightshow.

Expand All @@ -36,6 +42,9 @@ extensively documented and tested, and extendable for those users who
wish to add additional spectroscopy functionalities. There are also a
few comprehensive tutorials to help you get started.

<!--lightshow-intro-end-->


## Tutorials

We offer a few tutorials to get you started (with more on the way!)
Expand All @@ -48,6 +57,8 @@ We offer a few tutorials to get you started (with more on the way!)

## Installation

<!--standard-installation-start-->

To install Lightshow, simply use `pip`

``` bash
Expand All @@ -64,8 +75,14 @@ export MP_API_KEY="your_Materials_Project_v2_API_key"

More details can be found at our [documentation](https://ai-multimodal.github.io/Lightshow/installation.html).

<!--standard-installation-end-->


### Development installation


<!--dev-installation-start-->

For developers: after cloning Lightshow locally, install `pre-commit` via

```bash
Expand All @@ -74,12 +91,8 @@ pre-commit
pre-commit install
```

and check that the tests (below) work correctly.

### Running tests

For developers: tests can be run via `pytest`. After cloning, simply use

and check that the tests (below) work correctly (these can be run via `pytest`). After cloning, simply use
```bash
pytest lightshow/_tests
```
Expand All @@ -90,6 +103,17 @@ or with coverage
pytest -v --cov --cov-report xml lightshow/_tests
```

We use helper scripts to parse the ``pyproject.toml`` file and install only specific packages required for certain parts of development. For development, we recommend installing all dependencies:

```bash
bash scripts/install.sh # Install Lightshow's core dependencies
bash scripts/install.sh test # Install the test requirements only
bash scripts/install.sh doc # Install requirements for building the docs
```


<!--dev-installation-end-->


## Contributing

Expand All @@ -107,6 +131,7 @@ e.g. "VASP"). Take a look at the examples in the `lightshow.parameters` module f

## Funding acknowledgement

<!--funding-start-->
This research is based upon work supported by the U.S. Department of
Energy, Office of Science, Office Basic Energy Sciences, under Award
Number FWP PS-030. This research used resources of the Center for
Expand Down Expand Up @@ -140,3 +165,4 @@ ENERGY, OR THEIR EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR
NATURE RESULTING FROM EXERCISE OF THIS LICENSE AGREEMENT OR THE USE OF
THE SOFTWARE.
<!--funding-end-->
8 changes: 4 additions & 4 deletions docs/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line.
SPHINXOPTS = "-W" # This flag turns warnings into errors.
SPHINXBUILD = sphinx-build
SPHINXPROJ = PackagingScientificPython
# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?=
SPHINXBUILD ?= sphinx-build
SOURCEDIR = source
BUILDDIR = build

Expand Down
71 changes: 35 additions & 36 deletions docs/make.bat
Original file line number Diff line number Diff line change
@@ -1,36 +1,35 @@
@ECHO OFF

pushd %~dp0

REM Command file for Sphinx documentation

if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=sphinx-build
)
set SOURCEDIR=source
set BUILDDIR=build
set SPHINXPROJ=PackagingScientificPython

if "%1" == "" goto help

%SPHINXBUILD% >NUL 2>NUL
if errorlevel 9009 (
echo.
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
echo.installed, then set the SPHINXBUILD environment variable to point
echo.to the full path of the 'sphinx-build' executable. Alternatively you
echo.may add the Sphinx directory to PATH.
echo.
echo.If you don't have Sphinx installed, grab it from
echo.http://sphinx-doc.org/
exit /b 1
)

%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
goto end

:help
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%

:end
popd
@ECHO OFF

pushd %~dp0

REM Command file for Sphinx documentation

if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=sphinx-build
)
set SOURCEDIR=source
set BUILDDIR=build

%SPHINXBUILD% >NUL 2>NUL
if errorlevel 9009 (
echo.
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
echo.installed, then set the SPHINXBUILD environment variable to point
echo.to the full path of the 'sphinx-build' executable. Alternatively you
echo.may add the Sphinx directory to PATH.
echo.
echo.If you don't have Sphinx installed, grab it from
echo.https://www.sphinx-doc.org/
exit /b 1
)

if "%1" == "" goto help

%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
goto end

:help
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%

:end
popd
Binary file added docs/source/_static/lightshow-2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
32 changes: 32 additions & 0 deletions docs/source/api.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
===
API
===

.. toctree::
:maxdepth: 1
:hidden:

Database
========

.. automodule:: lightshow.database
:members:
:undoc-members:
:show-inheritance:

Parameters
==========

.. automodule:: lightshow.parameters
:members:
:undoc-members:
:show-inheritance:

Pymatgen Utilities
==================

.. automodule:: lightshow.pymatgen_utils
:members:
:undoc-members:
:show-inheritance:

Loading

0 comments on commit 6ff650b

Please sign in to comment.