Merge pull request #15 from mdpiper/fix-changelog-bug

Minor maintenance

.github/workflows/build-test-ci.yml

@@ -17,10 +17,10 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
@@ -41,12 +41,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: 3.12
 
       - name: Format
         run: |

CHANGES.md

@@ -1,13 +1,13 @@
 Changes: nbgitpuller-link
 =========================
 
-## 0.2.5 (unreleased)
----------------------
+0.2.5 (unreleased)
+------------------
 
 - Nothing changed yet.
 
 
-## 0.2.4 (2023-01-11)
+0.2.4 (2023-01-11)
 ------------------
 
 - Use nox for build system management (#13)

MANIFEST.in

@@ -1,6 +1,4 @@
-include *.md
 include *.cff
 include environment.yml
 include noxfile.py
 include examples/*
-include tests/*

environment.yml

@@ -17,5 +17,4 @@ dependencies:
   - pytest-cov
   - pytest-datadir
   - coveralls
-  - pip:
-    - zest.releaser
+  - zest.releaser

noxfile.py

@@ -10,7 +10,7 @@
 HERE = pathlib.Path(__file__)
 ROOT = HERE.parent
 PATHS = ["nbgitpuller_link", "examples", "tests", HERE.name]
-PYTHON_VERSIONS = ["3.9", "3.10", "3.11"]
+PYTHON_VERSIONS = ["3.10", "3.11", "3.12"]
 
 
 @nox.session(python=PYTHON_VERSIONS)

pyproject.toml

@@ -21,13 +21,16 @@ keywords = [
 license = {text = "MIT License"}
 classifiers = [
   "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "License :: OSI Approved :: MIT License",
   "Operating System :: OS Independent",
   "Intended Audience :: Developers",
   "Intended Audience :: Science/Research",
   "Intended Audience :: Education",
 ]
-requires-python = ">=3.7"
+requires-python = ">=3.10"
 dependencies = [
   "click",
   "validators",
@@ -63,7 +66,7 @@ testing = [
 nbgitpuller-link = "nbgitpuller_link.cli:main"
 
 [tool.setuptools.dynamic]
-readme = {file = ["README.md", "LICENSE.md"], content-type = "text/markdown"}
+readme = {file = ["README.md", "CHANGES.md", "LICENSE.md"], content-type = "text/markdown"}
 version = {attr = "nbgitpuller_link._version.__version__"}
 
 [tool.setuptools.packages.find]
@@ -77,7 +80,7 @@ norecursedirs = [".*", "*.egg*", "build", "dist"]
 addopts = """
   --ignore setup.py
   --tb native
-  --strict
+  --strict-markers
   --durations 16
   --doctest-modules
   -vvv
@@ -94,3 +97,10 @@ include_trailing_comma = true
 force_grid_wrap = 0
 combine_as_imports = true
 line_length = 88
+
+[tool.coverage.run]
+relative_files = true
+
+[tool.zest-releaser]
+tag-format = "v{version}"
+python-file-with-version = "nbgitpuller_link/_version.py"

setup.cfg

@@ -1,14 +1,7 @@
-[coverage:run]
-relative_files = True
-
 [flake8]
 exclude = docs
 ignore =
 	E203
 	E501
 	W503
 max-line-length = 88
-
-[zest.releaser]
-tag-format = v{version}
-python-file-with-version = nbgitpuller_link/_version.py

tests/test_cli.py

@@ -93,7 +93,7 @@ def test_valid_result():
         ["--jupyterhub-url=https://jupyter.org", "--repository-url=https://github.com"],
     )
     assert result.exit_code == 0
-    assert validators.url(result.output)
+    assert validators.url(result.output.rstrip("\n"))
 
 
 def test_optional_interface():
@@ -154,4 +154,4 @@ def test_space_in_launch_path():
         ],
     )
     assert result.exit_code == 0
-    assert validators.url(result.output)
+    assert validators.url(result.output.rstrip("\n"))