diff --git a/.gitignore b/.gitignore index 76a84da..6335027 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -*~ -*.pyc -dist/ -rattail_cognitive.egg-info +rattail.hw.cognitive.egg-info diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 928960f..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,60 +0,0 @@ - -# Changelog -All notable changes to rattail_cognitive will be documented in this file. - -The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) -and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). - - -## v0.4.0 (2024-07-09) - -### Feat - -- switch from setup.cfg to pyproject.toml + hatchling - -## 0.3.6 (2023-06-01) - -* Replace ``setup.py`` contents with ``setup.cfg``. - - -## 0.3.5 (2019-01-21) - -* Remove unused reference to ``cStringIO``. - - -## 0.3.4 (2017-07-07) - -* Switch license to GPL v3 (no longer Affero) - - -## 0.3.3 - -* Refactor some config usage per rattail changes. - - -## 0.3.2 - -* Fix broken barcode commands. - - UPC wasn't working, and EAN wasn't even being attempted... - - -## 0.3.1 - -* Refactor ``rattail.hw.cognitive`` -> ``rattail_cognitive``. - - -## 0.3a3 - -- [general] Fixed namespace package declaration. - -- [general] Added initial Fabric script. - - -## 0.3a2 - -- Tweaked default label format. - -## 0.3a1 - -- Initial port to Rattail v0.3. diff --git a/CHANGES.txt b/CHANGES.txt new file mode 100644 index 0000000..67cccaa --- /dev/null +++ b/CHANGES.txt @@ -0,0 +1,10 @@ + +0.3a2 +----- + +- Tweaked default label format. + +0.3a1 +----- + +- Initial port to Rattail v0.3. diff --git a/COPYING.txt b/COPYING.txt index 94a9ed0..dba13ed 100644 --- a/COPYING.txt +++ b/COPYING.txt @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ modification follow. 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found. Copyright (C) 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 + it under the terms of the GNU Affero 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. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see +For more information on this, and how to apply and follow the GNU AGPL, see . - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/MANIFEST.in b/MANIFEST.in index 3a6a904..ab30e9a 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1 @@ include *.txt -include *.rst diff --git a/README.md b/README.md deleted file mode 100644 index 5648c9d..0000000 --- a/README.md +++ /dev/null @@ -1,11 +0,0 @@ - -# rattail-cognitive - -Rattail is a retail software framework, released under the GNU General Public -License. - -This package contains hardware interfaces for -[Cognitive](http://www.cognitive.com/) devices. - -Please see Rattail's [home page](https://rattailproject.org/) for more -information. diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..49bc6cf --- /dev/null +++ b/README.txt @@ -0,0 +1,12 @@ + +rattail.hw.cognitive +==================== + +Rattail is a retail software framework based on `edbob `_, +and released under the GNU Affero General Public License. + +This package contains hardware interfaces for `Cognitive +`_ devices. + +Please see Rattail's `home page `_ for more +information. diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index 0742c23..0000000 --- a/pyproject.toml +++ /dev/null @@ -1,44 +0,0 @@ - -[build-system] -requires = ["hatchling"] -build-backend = "hatchling.build" - - -[project] -name = "rattail_cognitive" -version = "0.4.0" -description = "Hardware Interfaces for Cognitive Devices" -readme = "README.md" -authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] -license = {text = "GNU GPL v3+"} -classifiers = [ - "Development Status :: 3 - Alpha", - "Environment :: Console", - "Environment :: Web Environment", - "Environment :: Win32 (MS Windows)", - "Environment :: X11 Applications", - "Intended Audience :: Developers", - "Intended Audience :: System Administrators", - "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", - "Natural Language :: English", - "Operating System :: OS Independent", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Topic :: Office/Business", - "Topic :: Software Development :: Libraries :: Python Modules", -] -dependencies = [ - "rattail", -] - - -[project.urls] -Homepage = "https://rattailproject.org" -Repository = "https://kallithea.rattailproject.org/rattail-project-contrib/rattail-cognitive" -Changelog = "https://kallithea.rattailproject.org/rattail-project-contrib/rattail-cognitive/files/master/CHANGELOG.md" - - -[tool.commitizen] -version_provider = "pep621" -tag_format = "v$version" -update_changelog_on_bump = true diff --git a/rattail/__init__.py b/rattail/__init__.py new file mode 100644 index 0000000..de40ea7 --- /dev/null +++ b/rattail/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/rattail/hw/__init__.py b/rattail/hw/__init__.py new file mode 100644 index 0000000..de40ea7 --- /dev/null +++ b/rattail/hw/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/rattail/hw/cognitive/__init__.py b/rattail/hw/cognitive/__init__.py new file mode 100644 index 0000000..61e63c5 --- /dev/null +++ b/rattail/hw/cognitive/__init__.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +################################################################################ +# +# Rattail -- Retail Software Framework +# Copyright © 2010-2012 Lance Edgar +# +# This file is part of Rattail. +# +# Rattail is free software: you can redistribute it and/or modify it under the +# terms of the GNU Affero General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Rattail 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 Affero General Public License for +# more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with Rattail. If not, see . +# +################################################################################ + +""" +``rattail.hw.cognitive`` -- Cognitive Hardware Interfaces +""" + +from rattail.hw.cognitive._version import __version__ diff --git a/rattail/hw/cognitive/_version.py b/rattail/hw/cognitive/_version.py new file mode 100644 index 0000000..c83de13 --- /dev/null +++ b/rattail/hw/cognitive/_version.py @@ -0,0 +1 @@ +__version__ = '0.4a1' diff --git a/rattail_cognitive/labels.py b/rattail/hw/cognitive/labels.py similarity index 53% rename from rattail_cognitive/labels.py rename to rattail/hw/cognitive/labels.py index 6fe992d..cc05e03 100644 --- a/rattail_cognitive/labels.py +++ b/rattail/hw/cognitive/labels.py @@ -1,31 +1,34 @@ -# -*- coding: utf-8;-*- +#!/usr/bin/env python +# -*- coding: utf-8 -*- ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2018 Lance Edgar +# Copyright © 2010-2012 Lance Edgar # # This file is part of Rattail. # # Rattail 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. +# terms of the GNU Affero General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. # # Rattail 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. +# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for +# more details. # -# You should have received a copy of the GNU General Public License along with -# Rattail. If not, see . +# You should have received a copy of the GNU Affero General Public License +# along with Rattail. If not, see . # ################################################################################ + """ -Label Printing +``rattail.hw.cognitive.labels`` -- Label Printing """ -from __future__ import unicode_literals, absolute_import +from cStringIO import StringIO +import rattail from rattail import labels @@ -51,7 +54,7 @@ class BlasterFormatter(labels.CommandFormatter): ] def label_footer_commands(self): - noindex = self.config.getbool( + noindex = rattail.config.getboolean( 'rattail.hw.cognitive', 'blaster.hack_noindex', default=False) if noindex: return [ @@ -74,25 +77,9 @@ class BlasterTwoUpFormatter(labels.TwoUpCommandFormatter, BlasterFormatter): half_offset = 120 def label_body_commands(self, product, x=0): - - # Always remove check digit from UPC. - upc = unicode(product.upc)[:-1] - if len(upc) != 13: - raise ValueError(u"UPC format is unexpected: {0}".format(repr(product.upc))) - - # Create barcode command based on type of UPC. - if upc.startswith(u'00'): # UPC-A - barcode_type = u'UPCA+' - barcode = upc[2:] - elif upc.startswith(u'0'): # EAN-13 - barcode_type = u'EAN13+' - barcode = upc[1:] - else: - raise ValueError(u"UPC format is invalid: {0}".format(repr(product.upc))) - - description = u'{0} {1}'.format(product.description, product.size) + description = '%s %s' % (product.description, product.size) return [ - u'STRING 5X7(1,1,1,1) {0} 5 {1}'.format(x + 5, description[:17]), - u'STRING 5X7(1,1,1,1) {0} 15 {1}'.format(x + 5, description[17:]), - u'BARCODE {0} {1} 75 25 {2}'.format(barcode_type, x + 9, barcode), + 'STRING 5X7(1,1,1,1) %u 5 %s' % (x + 5, description[:17]), + 'STRING 5X7(1,1,1,1) %u 15 %s' % (x + 5, description[17:]), + 'BARCODE UPCA+ %u 75 25 %011u' % (x + 9, product.upc), ] diff --git a/rattail_cognitive/__init__.py b/rattail_cognitive/__init__.py deleted file mode 100644 index bbf5b1e..0000000 --- a/rattail_cognitive/__init__.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8;-*- -################################################################################ -# -# Rattail -- Retail Software Framework -# Copyright © 2010-2017 Lance Edgar -# -# This file is part of Rattail. -# -# Rattail 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. -# -# Rattail 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 -# Rattail. If not, see . -# -################################################################################ - -""" -Cognitive Hardware Interfaces -""" - -from rattail_cognitive._version import __version__ diff --git a/rattail_cognitive/_version.py b/rattail_cognitive/_version.py deleted file mode 100644 index 3336373..0000000 --- a/rattail_cognitive/_version.py +++ /dev/null @@ -1,6 +0,0 @@ -# -*- coding: utf-8; -*- - -from importlib.metadata import version - - -__version__ = version('rattail_cognitive') diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..018c3b4 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[egg_info] +tag_build = .dev diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..ec08585 --- /dev/null +++ b/setup.py @@ -0,0 +1,103 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +################################################################################ +# +# Rattail -- Retail Software Framework +# Copyright © 2010-2012 Lance Edgar +# +# This file is part of Rattail. +# +# Rattail is free software: you can redistribute it and/or modify it under the +# terms of the GNU Affero General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Rattail 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 Affero General Public License for +# more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with Rattail. If not, see . +# +################################################################################ + + +import os.path +from setuptools import setup, find_packages + + +here = os.path.abspath(os.path.dirname(__file__)) +execfile(os.path.join(here, 'rattail', 'hw', 'cognitive', '_version.py')) +README = open(os.path.join(here, 'README.txt')).read() +CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() + + +requires = [ + # + # Version numbers within comments below have specific meanings. + # Basically the 'low' value is a "soft low," and 'high' a "soft high." + # In other words: + # + # If either a 'low' or 'high' value exists, the primary point to be + # made about the value is that it represents the most current (stable) + # version available for the package (assuming typical public access + # methods) whenever this project was started and/or documented. + # Therefore: + # + # If a 'low' version is present, you should know that attempts to use + # versions of the package significantly older than the 'low' version + # may not yield happy results. (A "hard" high limit may or may not be + # indicated by a true version requirement.) + # + # Similarly, if a 'high' version is present, and especially if this + # project has laid dormant for a while, you may need to refactor a bit + # when attempting to support a more recent version of the package. (A + # "hard" low limit should be indicated by a true version requirement + # when a 'high' version is present.) + # + # In any case, developers and other users are encouraged to play + # outside the lines with regard to these soft limits. If bugs are + # encountered then they should be filed as such. + # + # package # low high + + 'rattail>=0.4a1.dev', # 0.4a1.dev + ] + + +setup( + name = "rattail.hw.cognitive", + version = __version__, + author = "Lance Edgar", + author_email = "lance@edbob.org", + url = "http://rattail.edbob.org/", + license = "GNU Affero GPL v3", + description = "Hardware Interfaces for Cognitive Devices", + long_description = README + '\n\n' + CHANGES, + + classifiers = [ + 'Development Status :: 3 - Alpha', + 'Environment :: Console', + 'Environment :: Web Environment', + 'Environment :: Win32 (MS Windows)', + 'Environment :: X11 Applications', + 'Intended Audience :: Developers', + 'Intended Audience :: System Administrators', + 'License :: OSI Approved :: GNU Affero General Public License v3', + 'Natural Language :: English', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + 'Topic :: Office/Business', + 'Topic :: Software Development :: Libraries :: Python Modules', + ], + + install_requires = requires, + + namespace_packages = ['rattail', 'rattail.hw'], + packages = find_packages(), + include_package_data = True, + zip_safe = False, + ) diff --git a/tasks.py b/tasks.py deleted file mode 100644 index 977854b..0000000 --- a/tasks.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8; -*- -################################################################################ -# -# Rattail -- Retail Software Framework -# Copyright © 2010-2024 Lance Edgar -# -# This file is part of Rattail. -# -# Rattail 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. -# -# Rattail 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 -# Rattail. If not, see . -# -################################################################################ -""" -Tasks for rattail-cognitive -""" - -import os -import shutil - -from invoke import task - - -@task -def release(c): - """ - Release a new version of `rattail`. - """ - if os.path.exists('rattail_cognitive.egg-info'): - shutil.rmtree('rattail_cognitive.egg-info') - if os.path.exists('dist'): - shutil.rmtree('dist') - - c.run('python -m build --sdist') - - c.run('twine upload dist/*')