From 64fbcec02b67e6f62336a5b725157c65693b575c Mon Sep 17 00:00:00 2001 From: charludo Date: Thu, 16 Jan 2025 12:20:29 +0100 Subject: [PATCH] nixpkg --- CHANGELOG.md | 6 ++-- README.md | 3 +- flake.nix | 36 +++++++++++++++++++ setup.py | 98 +++++++++++++++++++++++++++------------------------- 4 files changed, 92 insertions(+), 51 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d59730..9d21d5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] - nothing -## [1.2.0] - 2025-04-16 +## [1.2.1] - 2025-04-16 ### Added - Nix Flake containing both a dev shell and the barely package +## [1.2.0] - 2025-04-16 ### Changed - include the full `meta` field of collectibles in the exhibition list - use any `meta` field for sorting collections @@ -120,7 +121,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.9.0] - 2021-06-19 Initial beta release -[Unreleased]: https://github.com/charludo/barely/compare/v1.2.0...HEAD +[Unreleased]: https://github.com/charludo/barely/compare/v1.2.1...HEAD +[1.2.1]: https://github.com/charludo/barely/compare/v1.2.0...v1.2.1 [1.2.0]: https://github.com/charludo/barely/compare/v1.1.4...v1.2.0 [1.1.4]: https://github.com/charludo/barely/compare/v1.1.2...v1.1.4 [1.1.2]: https://github.com/charludo/barely/compare/v1.1.0...v1.1.2 diff --git a/README.md b/README.md index c61867b..8b94baa 100644 --- a/README.md +++ b/README.md @@ -297,10 +297,11 @@ Github Project Link: [https://github.com/charludo/barely](https://github.com/cha ## Changelog Most recent entries: -## [1.2.0] - 2025-04-16 +## [1.2.1] - 2025-04-16 ### Added - Nix Flake containing both a dev shell and the barely package +## [1.2.0] - 2025-04-16 ### Changed - include the full `meta` field of collectibles in the exhibition list - use any `meta` field for sorting collections diff --git a/flake.nix b/flake.nix index 8001f7b..0f26077 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,42 @@ pkgs = import nixpkgs { inherit system; }; in { + packages.default = pkgs.python312Packages.buildPythonPackage rec { + pname = "barely"; + version = "1.2.1"; + + src = pkgs.fetchPypi { + inherit pname version; + hash = "sha256-w3rkFiCJIwoBOQ+t1npfeJWcwB/8wCZC8bcP3wLms1U="; + }; + + + doCheck = false; + + pyproject = true; + build-system = [ pkgs.python312Packages.setuptools ]; + + propagatedBuildInputs = with pkgs.python312Packages; [ + pip + click + click-default-group + coloredlogs + mock + pyyaml + watchdog + pillow + gitpython + pygments + libsass + pysftp + livereload + binaryornot + jinja2 + mistune + calmjs + ] ++ [ pkgs.python312Full ]; + }; + devShells.default = pkgs.mkShell { packages = with pkgs; [ python39Full diff --git a/setup.py b/setup.py index 0b8de22..2d3e2dd 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ import pathlib + import setuptools # The directory containing this file @@ -7,51 +8,52 @@ # The text of the README file README = (HERE / "README.md").read_text() -setuptools.setup(name='barely', - version='1.2.0', - description='barely is a lightweight, but highly extensible static site generator written in pure python.', - long_description=README, - long_description_content_type="text/markdown", - keywords=['static site generator', 'jinja2', 'markdown', 'web development', 'blog'], - url='https://notablog.io', - download_url='https://github.com/charludo/barely/archive/refs/tags/v1.2.0.tar.gz', - author='Charlotte Hartmann Paludo', - author_email='barely@charlotteharludo.com', - license='GPL-3.0', - packages=setuptools.find_packages(), - include_package_data=True, - zip_safe=False, - entry_points={"console_scripts": ["barely = barely.cli:run"]}, - python_requires=">=3.9.0", - install_requires=[ - "click>=8.0.0", - "click-default-group>=1.2.2", - "coloredlogs>=15.0.0", - "mock>=4.0.0", - "pyyaml>=5.3.0", - "watchdog>=2.0.0", - "pillow>=8.0.0", - "GitPython>=3.0.0", - "pygments>=2.5.0", - "libsass>=0.21.0", - "pysftp>=0.2.5", - "livereload>=2.5.0", - "binaryornot>=0.4.0", - "jinja2>=3.0.0", - "mistune==2.0.0rc1", - "calmjs>=3.3.0" - ], - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Topic :: Text Processing :: Markup :: HTML', - 'Topic :: Text Processing :: General', - 'Topic :: Software Development :: Build Tools', - 'Topic :: Software Development', - 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', - 'Natural Language :: English', - 'Programming Language :: Python :: 3.9', - 'Environment :: Console', - 'Operating System :: OS Independent' - ] - ) +setuptools.setup( + name="barely", + version="1.2.1", + description="barely is a lightweight, but highly extensible static site generator written in pure python.", + long_description=README, + long_description_content_type="text/markdown", + keywords=["static site generator", "jinja2", "markdown", "web development", "blog"], + url="https://notablog.io", + download_url="https://github.com/charludo/barely/archive/refs/tags/v1.2.1.tar.gz", + author="Charlotte Hartmann Paludo", + author_email="barely@charlotteharludo.com", + license="GPL-3.0", + packages=setuptools.find_packages(), + include_package_data=True, + zip_safe=False, + entry_points={"console_scripts": ["barely = barely.cli:run"]}, + python_requires=">=3.9.0", + install_requires=[ + "click>=8.0.0", + "click-default-group>=1.2.2", + "coloredlogs>=15.0.0", + "mock>=4.0.0", + "pyyaml>=5.3.0", + "watchdog>=2.0.0", + "pillow>=8.0.0", + "GitPython>=3.0.0", + "pygments>=2.5.0", + "libsass>=0.21.0", + "pysftp>=0.2.5", + "livereload>=2.5.0", + "binaryornot>=0.4.0", + "jinja2>=3.0.0", + "mistune>=2.0.0rc1", + "calmjs>=3.3.0", + ], + classifiers=[ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "Topic :: Text Processing :: Markup :: HTML", + "Topic :: Text Processing :: General", + "Topic :: Software Development :: Build Tools", + "Topic :: Software Development", + "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", + "Natural Language :: English", + "Programming Language :: Python :: 3.9", + "Environment :: Console", + "Operating System :: OS Independent", + ], +)