From a23b95cde4c67eb97f13d92836924d735738e8af Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Fri, 9 Aug 2024 19:43:06 -0400 Subject: [PATCH 01/11] Add news under cookie.rst --- news/cookie.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 news/cookie.rst diff --git a/news/cookie.rst b/news/cookie.rst new file mode 100644 index 00000000..d15f9d43 --- /dev/null +++ b/news/cookie.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* Repo structure modified to the new diffpy standard + +**Security:** + +* From c79c7cc13f4a7fe05e772d4d4a339e9121e8e345 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Fri, 9 Aug 2024 20:23:41 -0400 Subject: [PATCH 02/11] Use doc/conf.py and liense from diffpy.pdfffit2 --- doc/source/license.rst | 69 +++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/doc/source/license.rst b/doc/source/license.rst index 826133d5..97502ecf 100644 --- a/doc/source/license.rst +++ b/doc/source/license.rst @@ -1,40 +1,39 @@ -License -======= +:tocdepth: -1 + +.. index:: license -This program is part of the DiffPy open-source project at Columbia -University and is available subject to the conditions and terms laid out -below. +License +####### -Copyright © 2009-2019, Trustees of Columbia University in the City of -New York, all rights reserved. +OPEN SOURCE LICENSE AGREEMENT +============================= +BSD 3-Clause License -For more information please visit the diffpy web-page at -http://diffpy.org or email Prof. Simon Billinge at sb2896@columbia.edu. +Copyright (c) {% now 'utc', '%Y' %}, The Trustees of Columbia University in +the City of New York. +All Rights Reserved. Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - * The name of COLUMBIA UNIVERSITY nor the names of its contributors - may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 190c28dfcd64e28ecdf3947cf8a6e31a3af598e4 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Fri, 9 Aug 2024 20:26:11 -0400 Subject: [PATCH 03/11] Modify conf.py --- doc/source/conf.py | 282 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 232 insertions(+), 50 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 444a86ac..0879959c 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -1,107 +1,289 @@ -# Configuration file for the Sphinx documentation builder. +#!/usr/bin/env python +# -*- coding: utf-8 -*- # -# This file only contains a selection of the most common options. For a full -# list see the documentation: -# http://www.sphinx-doc.org/en/master/config - -# -- Path setup -------------------------------------------------------------- +# diffpy.pdffit2 documentation build configuration file, created by +# sphinx-quickstart on Thu Jan 30 15:49:41 2014. +# +# This file is execfile()d with the current directory set to its +# containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. -import os +import sys +import time +from importlib.metadata import version +from pathlib import Path # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -# -import sys - -sys.path.insert(0, os.path.abspath("..")) +# documentation root, use Path().resolve() to make it absolute, like shown here. +# sys.path.insert(0, str(Path(".").resolve())) +sys.path.insert(0, str(Path("../..").resolve())) +sys.path.insert(0, str(Path("../../src").resolve())) +# abbreviations +ab_authors = "Billinge Group members and community contributors" -# -- Project information ----------------------------------------------------- +# -- General configuration ------------------------------------------------ -project = "snmf" -copyright = "2009-2023, Trustees of Columbia University in the City of New York, all rights reserved." -author = "Ran Gu, Adeolu Ajayi, Qiang Du, Simon J.L. Billinge" - -# The full version, including alpha/beta/rc tags -release = "0.1.0" - - -# -- General configuration --------------------------------------------------- +# If your documentation needs a minimal Sphinx version, state it here. +# needs_sphinx = '1.0' # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. -import sphinx_rtd_theme - extensions = [ "sphinx.ext.autodoc", "sphinx.ext.napoleon", "sphinx.ext.todo", "sphinx.ext.viewcode", "sphinx.ext.intersphinx", + "sphinx_rtd_theme", "m2r", ] -napoleon_google_docstring = False -napoleon_use_param = False -napoleon_use_ivar = False # Add any paths that contain templates here, relative to this directory. templates_path = ["_templates"] -from jinja2 import Environment, FileSystemLoader, Template +# The suffix(es) of source filenames. +# You can specify multiple suffix as a list of string: +# +source_suffix = [".rst", ".md"] -source_suffix = ".rst" +# The encoding of source files. +# source_encoding = 'utf-8-sig' +# The master toctree document. master_doc = "index" -language = "en" +# General information about the project. +project = "diffpy.snmf" +copyright = "%Y, The Trustees of Columbia University in the City of New York" + +# 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. + +fullversion = version(project) +# The short X.Y version. +version = "".join(fullversion.split(".post")[:1]) +# The full version, including alpha/beta/rc tags. +release = fullversion + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +# language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +# today = '' +today = time.strftime("%B %d, %Y", time.localtime()) +year = today.split()[-1] +# Else, today_fmt is used as the format for a strftime call. +# today_fmt = '%B %d, %Y' +# substitute YEAR in the copyright string +copyright = copyright.replace("%Y", year) + # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. -# This pattern also affects html_static_path and html_extra_path. -exclude_patterns = ["Thumbs.db", ".DS_Store"] +exclude_patterns = ["build"] + +# The reST default role (used for this markup: `text`) to use for all +# documents. +# default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +# add_function_parentheses = True +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +# add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +# show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. pygments_style = "sphinx" -todo_include_todos = True +# A list of ignored prefixes for module index sorting. +modindex_common_prefix = ["diffpy.snmf"] -# -- Options for HTML output ------------------------------------------------- +# Display all warnings for missing links. +nitpicky = True + +# -- Options for HTML output ---------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. +# html_theme = "sphinx_rtd_theme" -html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] -html_theme_options = {} +# 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. +# +html_theme_options = { + "navigation_with_keys": "true", +} + +# Add any paths that contain custom themes here, relative to this directory. +# html_theme_path = [] + +# The name for this set of Sphinx documents. If None, it defaults to +# " v documentation". +# html_title = None + +# A shorter title for the navigation bar. Default is the same as html_title. +# html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +# html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +# html_favicon = None # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ["_static"] +# html_static_path = ['_static'] + +# 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 = [] -htmlhelp_basename = "snmfdoc" +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +# html_last_updated_fmt = '%b %d, %Y' +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +# html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +# html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +# html_additional_pages = {} + +# If false, no module index is generated. +# html_domain_indices = True + +# If false, no index is generated. +# html_use_index = True + +# If true, the index is split into individual pages for each letter. +# html_split_index = False + +# If true, links to the reST sources are added to the pages. +# html_show_sourcelink = True + +# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. +# html_show_sphinx = True + +# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. +# html_show_copyright = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +# html_use_opensearch = '' + +# This is the file name suffix for HTML files (e.g. ".xhtml"). +# html_file_suffix = None + +# Output file base name for HTML help builder. +basename = "diffpy.snmf".replace(" ", "").replace(".", "") +htmlhelp_basename = basename + "doc" + + +# -- Options for LaTeX output --------------------------------------------- + +latex_elements = { + # The paper size ('letterpaper' or 'a4paper'). + # 'papersize': 'letterpaper', + # The font size ('10pt', '11pt' or '12pt'). + # 'pointsize': '10pt', + # Additional stuff for the LaTeX preamble. + # 'preamble': '', +} + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, +# author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, "snmf.tex", "Snmf Documentation", "author", "manual"), + ("index", "diffpy.snmf.tex", "diffpy.snmf Documentation", ab_authors, "manual"), ] -man_pages = [(master_doc, "snmf", "Snmf Documentation", [author], 1)] +# The name of an image file (relative to this directory) to place at the top of +# the title page. +# latex_logo = None +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +# latex_use_parts = False + +# If true, show page references after internal links. +# latex_show_pagerefs = False + +# If true, show URL addresses after external links. +# latex_show_urls = False + +# Documents to append as an appendix to all manuals. +# latex_appendices = [] + +# If false, no module index is generated. +# latex_domain_indices = True + + +# -- Options for manual page output --------------------------------------- + +# One entry per manual page. List of tuples +# (source start file, name, description, authors, manual section). +man_pages = [("index", "diffpy.pdffit2", "diffpy.pdffit2 Documentation", ab_authors, 1)] + +# If true, show URL addresses after external links. +# man_show_urls = False + + +# -- Options for Texinfo output ------------------------------------------- + +# Grouping the document tree into Texinfo files. List of tuples +# (source start file, target name, title, author, +# dir menu entry, description, category) texinfo_documents = [ ( - master_doc, - "snmf", - "Snmf Documentation", - author, - "snmf", + "index", + "diffpy.pdffit2", + "diffpy.pdffit2 Documentation", + ab_authors, + "diffpy.pdffit2", "One line description of project.", "Miscellaneous", ), ] -epub_title = project -epub_author = author -epub_publisher = author -epub_copyright = copyright +# Documents to append as an appendix to all manuals. +# texinfo_appendices = [] + +# If false, no module index is generated. +# texinfo_domain_indices = True + +# How to display URL addresses: 'footnote', 'no', or 'inline'. +# texinfo_show_urls = 'footnote' + +# If true, do not generate a @detailmenu in the "Top" node's menu. +# texinfo_no_detailmenu = False + -epub_exclude_files = ["search.html"] +# Example configuration for intersphinx: refer to the Python standard library. +# intersphinx_mapping = {'http://docs.python.org/': None} \ No newline at end of file From 75e1f15eddc080028a3f84dfb6b5a993cd0bc732 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 10 Aug 2024 00:30:58 +0000 Subject: [PATCH 04/11] [pre-commit.ci] auto fixes from pre-commit hooks --- doc/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 0879959c..0814b315 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -286,4 +286,4 @@ # Example configuration for intersphinx: refer to the Python standard library. -# intersphinx_mapping = {'http://docs.python.org/': None} \ No newline at end of file +# intersphinx_mapping = {'http://docs.python.org/': None} From 7aab5eb55c99d03dd9ad94aeb54b1e5955c9fa84 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Sat, 10 Aug 2024 19:00:50 -0400 Subject: [PATCH 05/11] Change of instances of pdffit2 to snmf --- doc/source/conf.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 0814b315..eea3def9 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# diffpy.pdffit2 documentation build configuration file, created by +# diffpy.snmf documentation build configuration file, created by # sphinx-quickstart on Thu Jan 30 15:49:41 2014. # # This file is execfile()d with the current directory set to its @@ -249,7 +249,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). -man_pages = [("index", "diffpy.pdffit2", "diffpy.pdffit2 Documentation", ab_authors, 1)] +man_pages = [("index", "diffpy.snmf", "diffpy.snmf Documentation", ab_authors, 1)] # If true, show URL addresses after external links. # man_show_urls = False @@ -263,10 +263,10 @@ texinfo_documents = [ ( "index", - "diffpy.pdffit2", - "diffpy.pdffit2 Documentation", + "diffpy.snmf", + "diffpy.snmf Documentation", ab_authors, - "diffpy.pdffit2", + "diffpy.snmf", "One line description of project.", "Miscellaneous", ), From 5b9bd964b19e341baaaf2bf96c2aed650cbc4757 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Sat, 10 Aug 2024 19:02:53 -0400 Subject: [PATCH 06/11] Fix date in readme.rst --- doc/source/license.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/license.rst b/doc/source/license.rst index 97502ecf..91267b96 100644 --- a/doc/source/license.rst +++ b/doc/source/license.rst @@ -9,7 +9,7 @@ OPEN SOURCE LICENSE AGREEMENT ============================= BSD 3-Clause License -Copyright (c) {% now 'utc', '%Y' %}, The Trustees of Columbia University in +Copyright (c) 2024, The Trustees of Columbia University in the City of New York. All Rights Reserved. @@ -36,4 +36,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file From 8163037ecbf2e39ac3fe34eb4ffd4496246698d1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 10 Aug 2024 23:03:06 +0000 Subject: [PATCH 07/11] [pre-commit.ci] auto fixes from pre-commit hooks --- doc/source/license.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/license.rst b/doc/source/license.rst index 91267b96..cfab61c2 100644 --- a/doc/source/license.rst +++ b/doc/source/license.rst @@ -36,4 +36,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 94d1d90a454fd64bed3f4ccbbfbf6cfdf66dce1d Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Sat, 10 Aug 2024 19:08:29 -0400 Subject: [PATCH 08/11] Update release news --- news/cookie.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/news/cookie.rst b/news/cookie.rst index d15f9d43..bdf76b4c 100644 --- a/news/cookie.rst +++ b/news/cookie.rst @@ -4,7 +4,8 @@ **Changed:** -* +* Support Python version 3.12 +* Remove support for Python version 3.9 **Deprecated:** @@ -17,6 +18,7 @@ **Fixed:** * Repo structure modified to the new diffpy standard +* Code linting based on .pre-commit-config.yaml **Security:** From bdacc6d6ff7d72a1743d03a6bff067b6bc20f76d Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Sat, 10 Aug 2024 19:13:52 -0400 Subject: [PATCH 09/11] Fix dev status to 4 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 01f1f5b2..1250363b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ keywords = ['diffpy', 'PDF'] readme = "README.rst" requires-python = ">=3.10" classifiers = [ - 'Development Status :: 5 - Production/Stable', + 'Development Status :: 4 - Beta', 'Environment :: Console', 'Intended Audience :: Developers', 'Intended Audience :: Science/Research', From b19d0245772577149f9383cae712379bff63c88a Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Sat, 10 Aug 2024 19:18:15 -0400 Subject: [PATCH 10/11] Add earlier year next to copyright 2024 --- doc/source/conf.py | 2 +- doc/source/license.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index eea3def9..a9211517 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -62,7 +62,7 @@ # General information about the project. project = "diffpy.snmf" -copyright = "%Y, The Trustees of Columbia University in the City of New York" +copyright = "2009-%Y, The Trustees of Columbia University in the City of New York" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/doc/source/license.rst b/doc/source/license.rst index cfab61c2..b9364226 100644 --- a/doc/source/license.rst +++ b/doc/source/license.rst @@ -9,7 +9,7 @@ OPEN SOURCE LICENSE AGREEMENT ============================= BSD 3-Clause License -Copyright (c) 2024, The Trustees of Columbia University in +Copyright (c) 2009-2024, The Trustees of Columbia University in the City of New York. All Rights Reserved. From 4f020be26a7307e5773cc0f648973bef6f026698 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Sat, 10 Aug 2024 22:32:42 -0400 Subject: [PATCH 11/11] Fix copyright years to 2023-2024 --- doc/source/conf.py | 2 +- doc/source/license.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index a9211517..195ee2ff 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -62,7 +62,7 @@ # General information about the project. project = "diffpy.snmf" -copyright = "2009-%Y, The Trustees of Columbia University in the City of New York" +copyright = "2023-%Y, The Trustees of Columbia University in the City of New York" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/doc/source/license.rst b/doc/source/license.rst index b9364226..2dd94692 100644 --- a/doc/source/license.rst +++ b/doc/source/license.rst @@ -9,7 +9,7 @@ OPEN SOURCE LICENSE AGREEMENT ============================= BSD 3-Clause License -Copyright (c) 2009-2024, The Trustees of Columbia University in +Copyright (c) 2023-2024, The Trustees of Columbia University in the City of New York. All Rights Reserved.