.bumpversion.cfg

@@ -0,0 +1,2 @@
+[bumpversion]
+current_version = 0.3.0

.coveragerc

@@ -0,0 +1,2 @@
+[run]
+source = ./bankbarcode

.github/workflows/python-app.yml

@@ -0,0 +1,49 @@
+
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: BANKBARCODE_CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      # You can use PyPy versions in python-version.
+      # For example, pypy2 and pypy3
+      fail-fast: false
+      matrix:
+        python-version: ["2.7", "3.11"]
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python 3
+      if: matrix.python-version == '3.11'
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install Python 2
+      if: matrix.python-version == '2.7'
+      run: |
+        sudo apt update
+        sudo apt install python2 python-pip
+        sudo update-alternatives --install /usr/bin/python python /usr/bin/python2 1
+        sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 2
+        printf '1\n' | sudo update-alternatives --config python
+        cd /usr/bin
+        sudo ln -s /usr/bin/pip2 ./pip
+
+    - name: Install dependencies
+      run: |
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
+        pip install -e .
+    - name: Run test
+      run: |
+        mamba --enable-coverage

.github/workflows/python-publish.yml

@@ -0,0 +1,40 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+'
+      - 'v[0-9]+\.[0-9]+\.[0-9]+'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Get tag
+        id: tag
+        uses: dawidd6/action-get-tag@v1
+        with:
+          strip_v: false
+      - name: Run setup
+        run: |
+          python setup.py sdist
+      - name: Creating a realease/pre-release
+        id: create_release
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{steps.tag.outputs.tag}}
+          draft: false
+          prerelease: ${{ contains(github.ref, '-rc') }}
+          generate_release_notes: true
+      - name: Publish a Python distribution to PyPI
+        if: ${{ contains(github.ref, '-rc') }} == false
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          password: ${{ secrets.PYPI_API_TOKEN_GITHUB_BANKBARCODE }}

.github/workflows/python-version.yml

@@ -0,0 +1,63 @@
+name: GISCE_BANKBARCODE_VERION
+on:
+  push:
+    branches: [ master ]
+jobs:
+  bump:
+    runs-on: ubuntu-latest
+    if: ${{ !startsWith(github.event.head_commit.message, 'Bump to v') }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ssh-key: ${{ secrets.SSH_PRIVATE }}
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Setup git
+        run: |
+          git config --global user.email "devel@gisce.net"
+          git config --global user.name "giscegit"
+      - name: Install python packages
+        run: |
+          pip install bump2version
+          pip install giscemultitools
+      - name: Get PR info
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_GIT_TOKEN }}
+          WORKSPACE: ${{github.workspace}}
+        run: |
+          echo 'PR_INFO<<EOF' >> $GITHUB_ENV
+          gisce_github get-commits-sha-from-merge-commit --owner gisce --repository bankbarcode --sha $GITHUB_SHA >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+      - name: Retrive info
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_GIT_TOKEN }}
+        run: |
+          eval `ssh-agent -s`
+          ssh-add - <<< '${{ secrets.SSH_PRIVATE }}'
+          pr_labels=$( echo '${{ env.PR_INFO }}' | jq -r '.pullRequest.labels' )
+          is_minor=false
+          is_major=false
+          is_patch=false
+          for label in echo $( echo $pr_labels | jq -r '.[].name' ); do
+            if [[ $label == 'minor' ]]; then
+              is_minor=true
+            elif [[ $label == 'major' ]]; then
+              is_major=true
+            elif [[ $label == 'patch' ]]; then
+              is_patch=true
+            fi
+          done
+          VERSION_TYPE=false
+          if [[ $is_major == true ]]; then
+            VERSION_TYPE="major"
+          elif [[ $is_minor == true ]]; then
+            VERSION_TYPE="minor"
+          elif [[ $is_patch == true ]]; then
+            VERSION_TYPE="patch"
+          fi
+          if [[ $VERSION_TYPE != false ]]; then
+            bump2version $VERSION_TYPE --tag --commit -m "Bump to v{new_version}" setup.py
+            git push origin master --tags
+          fi

README.rst

@@ -4,6 +4,9 @@ BankBarcode
 
 .. image:: https://travis-ci.org/gisce/bankbarcode.svg?branch=master
     :target: https://travis-ci.org/gisce/bankbarcode
+.. image:: https://coveralls.io/repos/github/gisce/bankbarcode/badge.svg?branch=master
+    :target: https://coveralls.io/github/gisce/bankbarcode?branch=master
+
 
 Python library to generate barcodes for financial documents
 

bankbarcode/__init__.py

@@ -1,5 +1,5 @@
 try:
     __version__ = __import__('pkg_resources') \
         .get_distribution(__name__).version
-except Exception, e:
+except Exception as e:
     __version__ = 'unknown'

bankbarcode/bankbarcode.py

@@ -1,5 +1,8 @@
 from barcode import generate
-from StringIO import StringIO
+import six
+from six.moves import StringIO
+from six import BytesIO
+from six import string_types
 
 
 class BankBarcode(object):
@@ -30,7 +33,7 @@ def _check_length(self, name, value, expected_length, description):
             return True
 
     def _strip_dotsvg(self, path):
-        if isinstance(path, basestring) and path[-4:] == '.svg':
+        if isinstance(path, string_types) and path[-4:] == '.svg':
             new_path = path[:-4]
         else:
             new_path = path
@@ -74,6 +77,6 @@ def svg(self, writer_options=None):
             http://pythonhosted.org/pyBarcode/writers/index.html?#common-options
         :return: a string with the barcode in SVG format
         """
-        f = StringIO()
+        f = BytesIO()
         self.save(f, writer_options)
-        return f.getvalue()
+        return f.getvalue().decode('utf-8')

bankbarcode/cuaderno57.py

@@ -1,8 +1,10 @@
 # coding=utf-8
+from __future__ import absolute_import, unicode_literals
 from datetime import datetime
 
-from bankbarcode import BankBarcode
+from .bankbarcode import BankBarcode
 from decimal import Decimal
+from six import text_type, string_types
 
 
 class Recibo(BankBarcode):
@@ -72,7 +74,7 @@ def _check_amount(self, amount):
             raise ValueError('{} have more than 2 decimals'.format(name))
         if decimal > 99999999.99:
             raise ValueError('{} is too big'.format(name))
-        value = unicode(int(decimal * 100)).zfill(10)
+        value = text_type(int(decimal * 100)).zfill(10)
         expected_length = 10
         description = 'amount lenth should be 10'
         return self._check_length(name, value, expected_length, description)
@@ -88,7 +90,7 @@ def _check_due_date(self, due_date, suffix):
         name = 'due_date'
         if due_date is None:
             return True
-        if isinstance(due_date, basestring):
+        if isinstance(due_date, string_types):
             try:
                 date = datetime.strptime(due_date, '%Y-%m-%d')
             except:
@@ -225,7 +227,7 @@ def amount(self, value):
 
         :param value: the amount (Importe)
         """
-        unicode_value = unicode(value)
+        unicode_value = text_type(value)
         if self._check_amount(unicode_value):
             self._amount = unicode_value
 
@@ -244,7 +246,7 @@ def due_date(self, due_date):
             self._due_date = None
         else:
             if self._check_due_date(due_date, self.suffix):
-                if isinstance(due_date, basestring):
+                if isinstance(due_date, string_types):
                     due_date = datetime.strptime(due_date, '%Y-%m-%d')
                 self._due_date = due_date
                 self._notice = self._due_date.strftime('%d%m%y')
@@ -273,19 +275,21 @@ def checksum(self):
             + int(self.notice) \
             + self.amount100()
         decimals = int(Decimal(sum) / 97 % 1 * 100)
-        return unicode(100 - decimals).zfill(2)
+        if not decimals:
+            return '00'
+        return text_type(100 - decimals).zfill(2)
 
     def code(self):
         """
         Generate the code for the barcode
 
         :return: an unicode string with the code for the barcode
         """
-        id_application = u'90'
-        format_type = u'507'
-        parity = u'0'
+        id_application = '90'
+        format_type = '507'
+        parity = '0'
 
-        amount100 = unicode(self.amount100()).zfill(10)
+        amount100 = text_type(self.amount100()).zfill(10)
 
         code = (
             '{id_application}'

requirements-dev.txt

@@ -1,2 +1,3 @@
-mamba
+mamba<=0.10.0;python_version<="2.7.18"
+mamba;python_version>"2.7.18"
 expects

requirements.txt

@@ -1,4 +1,5 @@
 # python-barcode
 # We need python-barcode v0.8, to have Code128 (EAN128), not released yet
 # https://bitbucket.org/whitie/python-barcode/issues/16/pypi-08-release-request
-https://bitbucket.org/whitie/python-barcode/get/6c22b96a2ca2.zip
+# https://bitbucket.org/whitie/python-barcode/get/6c22b96a2ca2.zip  0.8.0 fro py2 compat check
+python-barcode==0.8.0

setup.py

@@ -5,20 +5,17 @@
 
 setup(
     name='bankbarcode',
-    version='0.1.3',
+    version='0.3.0',
     packages=find_packages(),
     url='https://github.com/gisce/bankbarcode',
     license='GNU Affero General Public License v3',
     author='GISCE-TI, S.L.',
     author_email='devel@gisce.net',
     # We need python-barcode v0.8, to have Code128 (EAN128), not released yet
     # https://bitbucket.org/whitie/python-barcode/issues/16/pypi-08-release-request
-    dependency_links=[
-        "https://bitbucket.org/whitie/python-barcode/get/6c22b96.zip"
-        "#egg=pybarcode-0.8b1"
-    ],
     install_requires=[
-        'pybarcode>=0.8b1'
+        'python-barcode==0.8.0',
+        'six'
     ],
     description='barcodes for financial documents'
 )

spec/cuaderno57_Recibo507_checksum_spec.py

@@ -28,3 +28,12 @@
         amount = '37.62'
         checksum = '56'
         expect(Recibo507(entity, suffix, ref, notice, amount).checksum()).to(equal(checksum))
+
+    with it('accomplish another example'):
+        entity = '22350466'
+        suffix = '501'
+        ref = '00000085501'
+        notice = '130516'
+        amount = '56.92'
+        checksum = '00'
+        expect(Recibo507(entity, suffix, ref, notice, amount).checksum()).to(equal(checksum))

spec/cuaderno57_Recibo507_due_date_spec.py

@@ -11,7 +11,7 @@ def callback():
             ref = '12345678901'
             notice = '123456'
             amount = '6543.21'
-            due_date = datetime(2015, 11, 01)
+            due_date = datetime(2015, 11, 0o1)
             recibo = Recibo507(entity, suffix, ref, notice, amount, due_date)
         expect(callback).to(
             raise_error(ValueError,
@@ -23,7 +23,7 @@ def callback():
         ref = '00000000015'
         notice = '300815'
         amount = '53.98'
-        due_date = datetime(2015, 11, 01)
+        due_date = datetime(2015, 11, 0o1)
         recibo = Recibo507(entity, suffix, ref, notice, amount, due_date)
         expect(recibo.notice).not_to(equal(notice))
         expect(recibo.notice).to(equal(due_date.strftime('%d%m%y')))
@@ -35,7 +35,7 @@ def callback():
         notice = '300815'
         amount = '53.98'
         checksum = '27'
-        due_date = datetime(2015, 11, 01)
+        due_date = datetime(2015, 11, 0o1)
         recibo = Recibo507(entity, suffix, ref, notice, amount, due_date)
         expect(recibo.notice).to(equal(due_date.strftime('%d%m%y')))
         expect(recibo.checksum()).to(equal(checksum))