8000 skpkg: merge `migration` branch into `main` by cadenmyers13 · Pull Request #346 · diffpy/diffpy.utils · GitHub
[go: up one dir, main page]
Skip to content

skpkg: merge migration branch into main #346

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.

Sign up for GitHub

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

Merged
merged 17 commits into from
Jun 12, 2025
Merged

skpkg: merge migration branch into main #346

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
03effc3
skpkg: update .github dir with skpkg
cadenmyers13 Jun 10, 2025
6cb2273
skpkg: gitignore file from skpkg
cadenmyers13 Jun 10, 2025
f70eaa0
skpkg: small modifications to files in src
cadenmyers13 Jun 10, 2025
629141b
precommit: end of file fixer
cadenmyers13 Jun 10, 2025
21c9220
chore: news and pre-commit file
cadenmyers13 Jun 10, 2025
b4417be
Merge pull request #341 from cadenmyers13/setup-CI
sbillinge Jun 10, 2025
ae8caf4
skpkg: migration of docs
cadenmyers13 Jun 11, 2025
199cce8
skpkg: add config files for authors, changelog, code of conduct, lice…
cadenmyers13 Jun 11, 2025
b14be77
chore: news
cadenmyers13 Jun 11, 2025
6d739fd
Merge pull request #342 from cadenmyers13/doc-migration
sbillinge Jun 11, 2025
11ccb9d
skpkg: remove deprecated env.yml file
cadenmyers13 Jun 11, 2025
d8e4f00
skpkg: remove socioeconomic from codespell
cadenmyers13 Jun 11, 2025
b1717b8
skpkg: small changes to some config files
cadenmyers13 Jun 11, 2025
629a670
doc: add sphinx-copybutton as dependency
cadenmyers13 Jun 11, 2025
45a52e2
chore: news
cadenmyers13 Jun 11, 2025
9f3e153
chore: update news to no news
cadenmyers13 Jun 11, 2025
86e59be
Merge pull request #344 from cadenmyers13/news-and-misc
sbillinge Jun 11, 2025
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
Prev Previous commit
Next Next commit
skpkg: small modifications to files in src
  • Loading branch information
@cadenmyers13
cadenmyers13 committed Jun 10, 2025
commit f70eaa0ada15b4fa610571177b19be627fcf87e2
6 changes: 4 additions & 2 deletions src/diffpy/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/usr/bin/env python
##############################################################################
#
# (c) 2024 The Trustees of Columbia University in the City of New York.
# (c) 2025 The Trustees of Columbia University 8000 in the City of New York.
# All rights reserved.
#
# File coded by: Billinge Group members and community contributors.
# File coded by: Simon Billinge, Billinge Group members.
#
# See GitHub contributions for a more detailed list of contributors.
# https://github.com/diffpy/diffpy.utils/graphs/contributors
Expand All @@ -19,3 +19,5 @@

# silence the pyflakes syntax checker
assert __version__ or True

# End of file
6 changes: 4 additions & 2 deletions src/diffpy/utils/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/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: Simon Billinge, Billinge Group members.
#
# See GitHub contributions for a more detailed list of contributors.
# https://github.com/diffpy/diffpy.utils/graphs/contributors
Expand All @@ -21,3 +21,5 @@
from importlib.metadata import version

__version__ = version("diffpy.utils")

# End of file
0