-
Notifications
You must be signed in to change notification settings - Fork 21
skpkg: final skpkg migration of files #58
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
Changes from 10 commits
c1003ac
6300597
462a18c
b24e60a
b84b8d8
7410460
e2e5e0d
830af7d
f2e0ddc
ad73cb4
ea1c888
ac8a64d
62b83e5
1488319
e4a2700
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
### What problem does this PR address? | ||
|
||
<!-- Provide a brief overview and link to the issue. Attach outputs, including screenshots (before/after), if helpful for the reviewer. --> | ||
|
||
### What should the reviewer(s) do? | ||
|
||
<!-- Merge the code, provide feedback, initiate a discussion, etc. --> | ||
|
||
<!-- | ||
Use the following checklist items when applicable (select only what applies): | ||
- [ ] This PR introduces a public-facing change (e.g., figures, CLI input/output, API). | ||
- [ ] Documentation (e.g., tutorials, examples, README) has been updated. | ||
- [ ] A tracking issue or plan to update documentation exists. | ||
- [ ] This PR affects internal functionality only (no user-facing change). | ||
--> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,49 +1,15 @@ | ||
name: Tests on PR | ||
|
||
on: | ||
push: | ||
branches: | ||
- main | ||
- cookie | ||
pull_request: | ||
workflow_dispatch: | ||
|
||
jobs: | ||
validate: | ||
defaults: | ||
run: | ||
shell: bash -l {0} | ||
|
||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
os: [ubuntu-latest, windows-latest, macos-13, macos-14] | ||
python-version: [3.11, 3.12, 3.13] | ||
|
||
steps: | ||
- name: Check out diffpy.srreal | ||
uses: actions/checkout@v4 | ||
|
||
- name: Initialize miniconda | ||
uses: conda-incubator/setup-miniconda@v3 | ||
with: | ||
activate-environment: test | ||
auto-update-conda: true | ||
environment-file: environment.yml | ||
auto-activate-base: false | ||
python-version: ${{ matrix.python-version }} | ||
|
||
- name: Conda config | ||
run: >- | ||
conda config --set always_yes yes | ||
--set changeps1 no | ||
|
||
- name: Install diffpy.srreal and requirements | ||
run: | | ||
conda install --file requirements/conda.txt | ||
conda install --file requirements/test.txt | ||
python -m pip install . --no-deps | ||
|
||
- name: Validate diffpy.pdfgui | ||
run: pytest tests | ||
tests-on-pr: | ||
uses: scikit-package/release-scripts/.github/workflows/_tests-on-pr.yml@v0 | ||
with: | ||
project: diffpy.srreal | ||
c_extension: true | ||
headless: false | ||
secrets: | ||
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,7 @@ __pycache__/ | |
.Python | ||
env/ | ||
build/ | ||
_build/ | ||
develop-eggs/ | ||
dist/ | ||
downloads/ | ||
|
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
version: 2 | ||
|
||
build: | ||
os: "ubuntu-22.04" | ||
tools: | ||
python: "latest" | ||
|
||
python: | ||
install: | ||
- requirements: requirements/docs.txt | ||
|
||
sphinx: | ||
configuration: doc/source/conf.py |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
============= | ||
Release Notes | ||
Release notes | ||
============= | ||
|
||
.. current developments | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ | |
:target: https://diffpy.github.io/diffpy.srreal | ||
:height: 100px | ||
|
||
|PyPi| |Forge| |PythonVersion| |PR| | ||
|PyPI| |Forge| |PythonVersion| |PR| | ||
|
||
|CI| |Codecov| |Black| |Tracking| | ||
|
||
|
@@ -26,7 +26,7 @@ | |
|
||
.. |PR| image:: https://img.shields.io/badge/PR-Welcome-29ab47ff | ||
|
||
.. |PyPi| image:: https://img.shields.io/pypi/v/diffpy.srreal | ||
.. |PyPI| image:: https://img.shields.io/pypi/v/diffpy.srreal | ||
:target: https://pypi.org/project/diffpy.srreal/ | ||
|
||
.. |PythonVersion| image:: https://img.shields.io/pypi/pyversions/diffpy.srreal | ||
|
@@ -149,4 +149,9 @@ Before contributing, please read our `Code of Conduct <https://github.com/diffpy | |
Contact | ||
------- | ||
|
||
For more information on diffpy.srreal please visit the project `web-page <https://diffpy.github.io/>`_ or email Prof. Simon Billinge at [email protected]. | ||
For more information on diffpy.srreal please visit the project `web-page <https://diffpy.github.io/>`_ or email Simon Billinge at [email protected]. | ||
|
||
Acknowledgements | ||
---------------- | ||
|
||
``diffpy.srreal`` is built and maintained with `scikit-package <https://scikit-package.github.io/scikit-package/>`_. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
:tocdepth: -1 | ||
|
||
.. index:: getting-started | ||
|
||
.. _getting-started: | ||
|
||
================ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we may want to leave this here as a stub or remove it. If we leave it, the wording could change to something like "getting started information will appear here shortly" and make an issue to do it. On the whole, it may be better to just delete it. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @sbillinge yeah we can remove it. If we want to use the format later we can just pull it from skpkg. |
||
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`. |
Uh oh!
There was an error while loading. Please reload this page.