Merge branch 'release/v0.5.1'

.cruft.json

@@ -6,8 +6,8 @@
     "cookiecutter": {
       "full_name": "William P. Krekelberg",
       "email": "[email protected]",
-      "github_username": "wpk-nist-gov",
-      "pypi_username": "wpk-nist",
+      "github_username": "usnistgov",
+      "pypi_username": "conda-forge",
       "conda_channel": "wpk-nist",
       "project_name": "pyproject2conda",
       "project_slug": "pyproject2conda",

CHANGELOG.md

@@ -7,6 +7,28 @@ Changelog for `pyproject2conda`
 ## Unreleased
 
 See the fragment files in
-[changelog.d](https://github.com/wpk-nist-gov/pyproject2conda)
+[changelog.d](https://github.com/usnistgov/pyproject2conda)
 
 <!-- scriv-insert-here -->
+
+## v0.5.1 — 2023-09-09
+
+### Added
+
+- Added `--sort/--no-sort` flag to cli. Default is to sort dependecies. This
+  fixes issues with changing order in `pyproject.toml` leading to different yaml
+  files.
+
+### Changed
+
+- Changed structure of the repo to better support some third party tools.
+- Moved nox environments from `.nox` to `.nox/{project-name}/envs`. This fixes
+  issues with ipykernel giving odd names for locally installed environments.
+- Moved repo specific dot files to the `config` directory (e.g.,
+  `.noxconfig.toml` to `config/userconfig.toml`). This cleans up the top level
+  of the repo.
+- added some support for using `nbqa` to run mypy/pyright on notebooks.
+- Added ability to bootstrap development environment using pipx. This should
+  simplify initial setup. See Contributing for more info.
+
+- Main repo now on usnistgov.

CONTRIBUTING.md

@@ -7,7 +7,7 @@ You can contribute in many ways:
 
 ## Types of Contributions
 
-[issues]: https://github.com/wpk-nist-gov/pyproject2conda/issues
+[issues]: https://github.com/usnistgov/pyproject2conda/issues
 
 ### Report Bugs
 
@@ -404,7 +404,7 @@ conda activate {environment-name or -p path/to/environment}
 [conventional-style]: https://www.conventionalcommits.org/en/v1.0.0/
 [commitizen]: https://github.com/commitizen-tools/commitizen
 [nb_conda_kernels]: https://github.com/Anaconda-Platform/nb_conda_kernels
-[pyproject2conda]: https://github.com/wpk-nist-gov/pyproject2conda
+[pyproject2conda]: https://github.com/usnistgov/pyproject2conda
 [nbqa]: https://github.com/nbQA-dev/nbQA
 
 We recommend installing the following tools with [pipx] or [condax]. If you'd

README.md

@@ -20,12 +20,11 @@
 [docs-badge]: https://img.shields.io/badge/docs-sphinx-informational
 [docs-link]: https://pages.nist.gov/pyproject2conda/
 [repo-badge]: https://img.shields.io/badge/--181717?logo=github&logoColor=ffffff
-[repo-link]: https://github.com/wpk-nist-gov/pyproject2conda
-[conda-badge]: https://img.shields.io/conda/v/wpk-nist/pyproject2conda
-[conda-link]: https://anaconda.org/wpk-nist/pyproject2conda
+[repo-link]: https://github.com/usnistgov/pyproject2conda
+[conda-badge]: https://img.shields.io/conda/v/conda-forge/pyproject2conda
+[conda-link]: https://anaconda.org/conda-forge/pyproject2conda
 [license-badge]: https://img.shields.io/pypi/l/cmomy?color=informational
-[license-link]:
-  https://github.com/wpk-nist-gov/pyproject2conda/blob/main/LICENSE
+[license-link]: https://github.com/usnistgov/pyproject2conda/blob/main/LICENSE
 
 <!-- other links -->
 
@@ -65,7 +64,7 @@ pip install pyproject2conda
 or
 
 ```bash
-conda install -c wpk-nist pyproject2conda
+conda install -c conda-forge pyproject2conda
 ```
 
 ## Example usage

config/recipe-append.yaml

@@ -8,7 +8,7 @@ test:
     - pip
 
 about:
-  home: https://github.com/wpk-nist-gov/pyproject2conda
+  home: https://github.com/usnistgov/pyproject2conda
   summary:
     A script to convert a Python project declared on a pyproject.toml to a conda
     environment.

docs/conf.py

@@ -119,10 +119,10 @@
 # - top level variables --------------------------------------------------------
 # set github_username variable to be subbed later.
 # this makes it easy to switch from wpk -> usnistgov later
-github_username = "wpk-nist-gov"
+github_username = "usnistgov"
 
 html_context = {
-    "github_user": "wpk-nist-gov",
+    "github_user": "usnistgov",
     "github_repo": "pyproject2conda",
     "github_version": "main",
     "doc_path": "docs",

docs/installation.md

@@ -11,7 +11,7 @@ pip install pyproject2conda
 or
 
 ```bash
-conda install -c wpk-nist pyproject2conda
+conda install -c conda-forge pyproject2conda
 ```
 
 This is the preferred method to install pyproject2conda, as it will always
@@ -24,7 +24,7 @@ The sources for pyproject2conda can be downloaded from the [Github repo].
 You can either clone the public repository:
 
 ```bash
-git clone git://github.com/wpk-nist-gov/pyproject2conda.git
+git clone git://github.com/usnistgov/pyproject2conda.git
 ```
 
 Once you have a copy of the source, you can install it with:
@@ -51,4 +51,4 @@ pyproject2conda yaml -o environment/base.yaml
 where options in brackets are options (for environment name, and editable
 install, respectively).
 
-[github repo]: https://github.com/wpk-nist-gov/pyproject2conda
+[github repo]: https://github.com/usnistgov/pyproject2conda

pyproject.toml

@@ -35,7 +35,7 @@ dependencies = [
 ] # additional packages
 
 [project.urls]
-homepage = "https://github.com/wpk-nist-gov/pyproject2conda"
+homepage = "https://github.com/usnistgov/pyproject2conda"
 documentation = "https://pages.nist.gov/pyproject2conda/"
 
 [project.optional-dependencies]