Skip to content

Commit 56be4d8

Browse files
sbillingesbillinge
authored
Merge pull request #12 from diffpy/cookie
Cookie
2 parents 2354a75 + d1f2c49 commit 56be4d8

38 files changed

+1037
-170
lines changed

Diff for: ‎.github/workflows/check-news-item.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Check for News
2+
3+
on:
4+
pull_request_target:
5+
branches:
6+
- main
7+
8+
jobs:
9+
build:
10+
uses: Billingegroup/release-scripts/.github/workflows/_check-news-item.yml@v0
11+
with:
12+
project: diffpy.fourigui

Diff for: ‎.github/workflows/docs.yml

-60
This file was deleted.

Diff for: ‎.github/workflows/main.yml

-55
This file was deleted.

Diff for: ‎.github/workflows/matrix-and-codecov-on-merge-to-main.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
release:
8+
types:
9+
- prereleased
10+
- published
11+
workflow_dispatch:
12+
13+
jobs:
14+
coverage:
15+
uses: Billingegroup/release-scripts/.github/workflows/_matrix-and-codecov-on-merge-to-main.yml@v0
16+
with:
17+
project: diffpy.fourigui
18+
c_extension: false
19+
headless: true
20+
secrets:
21+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

Diff for: ‎.github/workflows/pre-commit.yml

-19
This file was deleted.

Diff for: ‎.github/workflows/publish-docs-on-release.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Build and Deploy Docs
2+
3+
on:
4+
release:
5+
types:
6+
- published
7+
workflow_dispatch:
8+
9+
jobs:
10+
docs:
11+
uses: Billingegroup/release-scripts/.github/workflows/_publish-docs-on-release.yml@v0
12+
with:
13+
project: diffpy.fourigui
14+
c_extension: false

Diff for: ‎.github/workflows/tests-on-pr.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Tests on PR
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
workflow_dispatch:
9+
10+
jobs:
11+
validate:
12+
uses: Billingegroup/release-scripts/.github/workflows/_tests-on-pr.yml@v0
13+
with:
14+
project: diffpy.fourigui
15+
c_extension: false
16+
headless: true

Diff for: ‎.pre-commit-config.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ repos:
1616
- id: check-yaml
1717
- id: end-of-file-fixer
1818
- id: trailing-whitespace
19-
exclude: '\.(rst|txt)$'
19+
- id: check-case-conflict
20+
- id: check-merge-conflict
21+
- id: check-toml
22+
- id: check-added-large-files
2023
- repo: https://github.com/psf/black
2124
rev: 24.4.2
2225
hooks:

Diff for: ‎AUTHORS.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Authors
22
=======
33

4-
Billinge Group and community contibutors.
4+
Billinge Group and community contributors.
55

66
Contributors
77
------------

Diff for: ‎MANIFEST.in

+12-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
include AUTHORS.rst
2-
include LICENSE
3-
include README.rst
4-
include requirements.txt
5-
6-
recursive-exclude * __pycache__
7-
recursive-exclude * *.py[co]
8-
9-
recursive-include docs *.rst conf.py Makefile make.bat
10-
11-
include diffpy.fourigui/version.py
12-
13-
# If including data files in the package, add them like:
14-
# include path/to/data_file
1+
graft src
2+
graft tests
3+
graft requirements
4+
5+
include AUTHORS.rst LICENSE*.rst README.rst
6+
7+
# Exclude all bytecode files and __pycache__ directories
8+
global-exclude *.py[cod] # Exclude all .pyc, .pyo, and .pyd files.
9+
global-exclude .DS_Store # Exclude Mac filesystem artifacts.
10+
global-exclude __pycache__ # Exclude Python cache directories.
11+
global-exclude .git* # Exclude git files and directories.
12+
global-exclude .idea # Exclude PyCharm project settings.

Diff for: ‎README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Support and Contribute
9090

9191
`Diffpy user group <https://groups.google.com/g/diffpy-users>`_ is the discussion forum for general questions and discussions about the use of diffpy.fourigui. Please join the diffpy.fourigui users community by joining the Google group. The diffpy.fourigui project welcomes your expertise and enthusiasm!
9292

93-
If you see a bug or want to request a feature, please `report it as an issue <https://github.com/diffpy/diffpy.fourigui/issues>`_ and/or `submit a fix as a PR <https://github.com/diffpy/diffpy.fourigui/pulls>`_. You can also post it to the `Diffpy user group <https://groups.google.com/g/diffpy-users>`_.
93+
If you see a bug or want to request a feature, please `report it as an issue <https://github.com/diffpy/diffpy.fourigui/issues>`_ and/or `submit a fix as a PR <https://github.com/diffpy/diffpy.fourigui/pulls>`_. You can also post it to the `Diffpy user group <https://groups.google.com/g/diffpy-users>`_.
9494

9595
Feel free to fork the project and contribute. To install diffpy.fourigui
9696
in a development mode, with its sources being directly used by Python

Diff for: ‎doc/source/license.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ OPEN SOURCE LICENSE AGREEMENT
99
=============================
1010
BSD 3-Clause License
1111

12-
Copyright (c) 2024, The Trustees of Columbia University in
12+
Copyright (c) 2024, The Trustees of Columbia University in
1313
the City of New York.
14-
All Rights Reserved.
14+
All Rights Reserved.
1515

1616
Redistribution and use in source and binary forms, with or without
1717
modification, are permitted provided that the following conditions are met:

Diff for: ‎news/recut.rst

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
**Added:**
2+
3+
* <news item>
4+
5+
**Changed:**
6+
7+
* <news item>
8+
9+
**Deprecated:**
10+
11+
* <news item>
12+
13+
**Removed:**
14+
15+
* <news item>
16+
17+
**Fixed:**
18+
19+
* cookiecut to group's Python package standard
20+
* add pip packages under pip.txt
21+
22+
**Security:**
23+
24+
* <news item>

Diff for: ‎pyproject.toml

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[build-system]
2-
requires = ["setuptools>=62.0", "setuptools-git-versioning<2"]
2+
requires = ["setuptools>=62.0", "setuptools-git-versioning>=2.0"]
33
build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "diffpy.fourigui"
7-
dynamic=['version']
7+
dynamic=['version', 'dependencies']
88
authors = [
99
{ name="Simon J.L. Billinge group", email="[email protected]" },
1010
]
@@ -45,9 +45,12 @@ dirty_template = "{tag}"
4545
[tool.setuptools.packages.find]
4646
where = ["src"] # list of folders that contain the packages (["."] by default)
4747
include = ["*"] # package names should match these glob patterns (["*"] by default)
48-
exclude = ["diffpy.fourigui.tests*"] # exclude packages matching these glob patterns (empty by default)
48+
exclude = [] # exclude packages matching these glob patterns (empty by default)
4949
namespaces = false # to disable scanning PEP 420 namespaces (true by default)
5050

51+
[tool.setuptools.dynamic]
52+
dependencies = {file = ["requirements/pip.txt"]}
53+
5154
[tool.black]
5255
line-length = 115
5356
include = '\.pyi?$'

Diff for: ‎requirements/README.txt

-11
This file was deleted.

Diff for: ‎requirements/build.txt

-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
python
2-
setuptools

Diff for: ‎requirements/conda.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
h5py
2+
time
3+
tk
4+
matplotlib-base
5+
numpy

Diff for: ‎requirements/pip.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
h5py
2+
time
3+
tk
4+
matplotlib
5+
numpy

Diff for: ‎requirements/run.txt

Whitespace-only changes.

Diff for: ‎requirements/test.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ flake8
22
pytest
33
codecov
44
coverage
5+
pytest-cov
56
pytest-env

Diff for: ‎src/diffpy/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@
2121
__path__ = extend_path(__path__, __name__)
2222

2323
# End of file
24-

0 commit comments

Comments
 (0)