From 8260dd6444b69bdcd5958cec103fe64079cf3875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Fri, 20 Dec 2019 09:48:28 +0100 Subject: [PATCH] Update CHANGELOG. --- CHANGELOG.md | 8 +++- bin/stegano-red | 56 -------------------------- bin/stegano-steganalysis-parity | 44 --------------------- bin/stegano-steganalysis-statistics | 45 --------------------- pyproject.toml | 15 ++++--- setup.py.back | 61 ----------------------------- 6 files changed, 17 insertions(+), 212 deletions(-) delete mode 100644 bin/stegano-red delete mode 100644 bin/stegano-steganalysis-parity delete mode 100644 bin/stegano-steganalysis-statistics delete mode 100644 setup.py.back diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e0b1c0..cd0c4a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,15 @@ ## Release History +### 0.9.8 (2019-12-20) + +* stegano is now using poetry; +* minor improvements to the command line. + + ### 0.9.7 (2019-10-27) -* fixed markdown of the previous release; +* fixed markdown of the previous release. ### 0.9.6 (2019-10-27) diff --git a/bin/stegano-red b/bin/stegano-red deleted file mode 100644 index da0651a..0000000 --- a/bin/stegano-red +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# Stegano - Stegano is a pure Python steganography module. -# Copyright (C) 2010-2019 Cédric Bonhomme - https://www.cedricbonhomme.org -# -# For more information : https://github.com/cedricbonhomme/Stegano -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see - -__author__ = "Cedric Bonhomme" -__version__ = "$Revision: 0.1 $" -__date__ = "$Date: 2017/02/06 $" -__license__ = "GPLv3" - -try: - from stegano import red -except: - print("Install stegano: sudo pip install Stegano") - -import argparse -parser = argparse.ArgumentParser(prog='stegano-red') -subparsers = parser.add_subparsers(help='sub-command help', dest='command') - -parser_hide = subparsers.add_parser('hide', help='hide help') -parser_hide.add_argument("-i", "--input", dest="input_image_file", - help="Image file") -parser_hide.add_argument("-m", dest="secret_message", - help="Your secret message to hide (non binary).") -parser_hide.add_argument("-o", "--output", dest="output_image_file", - help="Image file") - -parser_reveal = subparsers.add_parser('reveal', help='reveal help') -parser_reveal.add_argument("-i", "--input", dest="input_image_file", - help="Image file") - -arguments = parser.parse_args() - -if arguments.command == 'hide': - secret = red.hide(arguments.input_image_file, arguments.secret_message) - secret.save(arguments.output_image_file) - -elif arguments.command == 'reveal': - secret = red.reveal(arguments.input_image_file) - print(secret) diff --git a/bin/stegano-steganalysis-parity b/bin/stegano-steganalysis-parity deleted file mode 100644 index f2f7173..0000000 --- a/bin/stegano-steganalysis-parity +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# Stegano - Stegano is a pure Python steganography module. -# Copyright (C) 2010-2019 Cédric Bonhomme - https://www.cedricbonhomme.org -# -# For more information : https://github.com/cedricbonhomme/Stegano -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see - -__author__ = "Cedric Bonhomme" -__version__ = "$Revision: 0.7 $" -__date__ = "$Date: 2016/08/25 $" -__license__ = "GPLv3" - -try: - from stegano.steganalysis import parity -except: - print("Install Stegano: pipx install Stegano") - -from PIL import Image - -import argparse -parser = argparse.ArgumentParser(prog='stegano-steganalysis-parity') -parser.add_argument("-i", "--input", dest="input_image_file", - required=True, help="Input image file.") -parser.add_argument("-o", "--output", dest="output_image_file", - required=True, help="Output image file.") -arguments = parser.parse_args() - -input_image_file = Image.open(arguments.input_image_file) -output_image = parity.steganalyse(input_image_file) -output_image.save(arguments.output_image_file) diff --git a/bin/stegano-steganalysis-statistics b/bin/stegano-steganalysis-statistics deleted file mode 100644 index 2acdf20..0000000 --- a/bin/stegano-steganalysis-statistics +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# Stegano - Stegano is a pure Python steganography module. -# Copyright (C) 2010-2019 Cédric Bonhomme - https://www.cedricbonhomme.org -# -# For more information : https://github.com/cedricbonhomme/Stegano -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see - -__author__ = "Cédric Bonhomme" -__version__ = "$Revision: 0.1 $" -__date__ = "$Date: 2016/08/26 $" -__revision__ = "$Date: 2016/08/26 $" -__license__ = "GPLv3" - -try: - from stegano.steganalysis import statistics -except: - print("Install Stegano: sudo pip install Stegano") - -from PIL import Image - -import argparse -parser = argparse.ArgumentParser(prog='stegano-steganalysis-parity') -parser.add_argument("-i", "--input", dest="input_image_file", - help="Image file") -parser.add_argument("-o", "--output", dest="output_image_file", - help="Image file") -arguments = parser.parse_args() - -input_image_file = Image.open(arguments.input_image_file) -output_image = statistics.steganalyse(input_image_file) -output_image.save(arguments.output_image_file) diff --git a/pyproject.toml b/pyproject.toml index 098902a..dfb8fd6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,10 +6,15 @@ authors = [ "Cédric Bonhomme " ] license = "GPL-3.0-or-later" + readme = "README.md" + homepage = "https://git.sr.ht/~cedric/stegano" repository = "https://git.sr.ht/~cedric/stegano" documentation = "https://stegano.readthedocs.io" + +keywords = ["steganography", "security", "stegano"] + classifiers = [ "Development Status :: 5 - Production/Stable", "Environment :: Console", @@ -21,21 +26,21 @@ classifiers = [ "Programming Language :: Python :: 3.8", "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)" ] + include = [ "CHANGELOG.md", "COPYING", "CHANGELOG.md", "docs/**/*", - "bin/" + "bin/*" ] [tool.poetry.scripts] stegano-lsb = "bin.lsb:main" stegano-lsb-set = "bin.lsbset:main" -# stegano-lsb-set = "bin.stegano-lsb-set" -# stegano-red = "bin.stegano-red" -# stegano-steganalysis-parity = "bin.stegano-steganalysis-parity" -# stegano-steganalysis-statistics = "bin.stegano-steganalysis-statistics" +stegano-red = "bin.red:main" +stegano-steganalysis-parity = "bin.parity:main" +stegano-steganalysis-statistics = "bin.statistics:main" [tool.poetry.dependencies] python = "^3.7" diff --git a/setup.py.back b/setup.py.back deleted file mode 100644 index 8aab922..0000000 --- a/setup.py.back +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -import codecs -import os - -from setuptools import setup - -here = os.path.abspath(os.path.dirname(__file__)) - -packages = [ - 'stegano', - 'stegano.red', - 'stegano.exifHeader', - 'stegano.lsb', - 'stegano.lsbset', - 'stegano.steganalysis' -] - -scripts = [ - 'bin/stegano-lsb', - 'bin/stegano-lsb-set', - 'bin/stegano-red', - 'bin/stegano-steganalysis-parity', - 'bin/stegano-steganalysis-statistics' -] - -requires = ['pillow', 'piexif', 'crayons'] - -with codecs.open(os.path.join(here, 'README.md'), encoding='utf-8') as f: - readme = f.read() -with codecs.open(os.path.join(here, 'CHANGELOG.md'), encoding='utf-8') as f: - changelog = f.read() - -setup( - name='Stegano', - version='0.9.7', - author='Cédric Bonhomme', - author_email='cedric@cedricbonhomme.org', - packages=packages, - include_package_data=True, - scripts=scripts, - url='https://git.sr.ht/~cedric/stegano', - description='A pure Python Steganography module.', - long_description_content_type='text/markdown', - long_description=readme + '\n\n' + changelog, - platforms = ['Linux'], - license='GPLv3', - install_requires=requires, - zip_safe=False, - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Console', - 'Intended Audience :: Developers', - 'Intended Audience :: Science/Research', - 'Topic :: Security', - 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)' - ] -)