Merge pull request #104 from reingart/main

Sync with main fork

Author: reingart

.github/workflows/python-package.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [2.7, 3.9]
+        python-version: [2.7, 3.9, 3.11]
 
     steps:
     - uses: actions/checkout@v2
@@ -43,9 +43,6 @@ jobs:
       run: |
         wget  "https://www.sistemasagiles.com.ar/soft/pyafipws/reingart2021.zip" -O reingart2019.zip
         unzip reingart2019.zip
-    - name: Fix OpenSSL "dh key too small"
-      run: |
-        sudo cp .github/openssl.cnf /etc/ssl/openssl.cnf
     - name: Copy rece.ini file
       run: |
         sudo cp conf/rece.ini rece.ini

.github/workflows/windows-installer.yml

@@ -0,0 +1,166 @@
+# This workflow will install Python dependencies, build EXE and run some tests in Windows
+# For more information see: https://github.com/py2exe/py2exe/blob/master/.github/workflows/CI.yml
+
+name: Windows Installer
+
+on: [push]
+
+jobs:
+  compile:
+
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10"]
+        targetplatform: [x86, x64]
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+        architecture : ${{ matrix.targetplatform }}
+    - name: Upgrade the package manager and related libraries
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install --upgrade setuptools wheel
+        python -m pip install --upgrade cachetools pefile
+    - name: Install production dependencies
+      run: |
+        pip install -r requirements.txt
+    - name: Install development dependencies
+      run: |
+        pip install -r requirements-dev.txt
+    - name: Remove python2 library conflicts with py2exe
+      run: |
+        python -c "import aenum, os; os.unlink(os.path.join(os.path.dirname(aenum.__file__), '_py2.py'))"
+    - name: Install package
+      run: |
+        python setup.py install
+    - name: Build executables
+      run: |
+        python setup_win.py py2exe
+    - name: Remove uneeded libs (TK)
+      run: |
+        Remove-Item .\dist\lib\tcl -recurse
+        Remove-Item .\dist\lib\tk -recurse
+    - name: Copy PowerShell tests into the release artifact
+      run: |
+        mkdir .\dist\tests
+        copy .\tests\powershell\*.* .\dist\tests
+    - name: Save repository metadata for release env-vars
+      run: |
+        echo release_version="${{ matrix.python-version }}".$(git rev-list --count --all) > dist/.env
+        echo git_short_hash=$(git rev-parse --short head) >> dist/.env
+        echo git_branch=$(git branch --show-current) >> dist/.env
+        echo workflow trigger: "${{ github.ref }}" - "${{ github.ref_name }}"
+        type dist/.env
+    - name: Deploy distribution binaries
+      uses: actions/upload-artifact@v3
+      with:
+        name: dist-${{ matrix.targetplatform }}
+        path: |
+          dist/
+
+  test:
+    name: "Full End-2-End test"
+    needs: compile
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        targetplatform: [x86, x64]
+    steps:
+    - name: Download distribution binaries
+      uses: actions/download-artifact@v3
+      with:
+        name: dist-${{ matrix.targetplatform }}
+    - name: Download certificate and private key
+      run: |
+        Invoke-WebRequest -Uri "https://www.sistemasagiles.com.ar/soft/pyafipws/reingart2021.zip" -OutFile reingart2019.zip
+        Expand-Archive reingart2019.zip -DestinationPath .
+    - name: Replace certificate and private key from secrets
+      shell: pwsh
+      env:
+        AFIP_TEST_PRIV_KEY: ${{ secrets.AFIP_TEST_PRIV_KEY }}
+        AFIP_TEST_CERT2: ${{ secrets.AFIP_TEST_CERT2 }}
+        AFIP_TEST_CERT3: ${{ secrets.AFIP_TEST_CERT3 }}
+        TARGET_PLATFORM: ${{ matrix.targetplatform }}
+      if: "${{ env.AFIP_TEST_PRIV_KEY != '' }}"
+      run: |
+        "$env:AFIP_TEST_PRIV_KEY" | Out-File -FilePath reingart.key
+        $( if ( "$env:TARGET_PLATFORM" -eq "x64" ) { "$env:AFIP_TEST_CERT2" } else { "$env:AFIP_TEST_CERT3" } ) | Out-File -FilePath reingart.crt
+        Get-Content -Path reingart.crt
+        Write-Host "TARGET_PLATFORM: $env:TARGET_PLATFORM"
+    - name: Copy rece.ini file
+      run: |
+        copy conf\rece.ini .
+    - name: Test WSAA command line interface
+      run: |
+        .\wsaa.exe --analizar reingart.crt reingart.key wsmtxca 300
+    - name: Register WSAA component
+      run: |
+        .\wsaa.exe --register
+        Get-Content -Path $Env:APPDATA\wsaa.log -ErrorAction SilentlyContinue
+    - name: Register WSAA component (debug)
+      continue-on-error: true
+      run: |
+        reg export "HKEY_CLASSES_ROOT\CLSID\{51342E57-9681-4610-AF2B-686267470930}" wsaa.reg
+        type wsaa.reg
+    - name: Register WSFEv1 component
+      run: |
+        .\wsfev1.exe --register
+        Get-Content -Path $Env:APPDATA\wsfev1.log -ErrorAction SilentlyContinue
+    - name: Register WSFEv1 component (debug)
+      continue-on-error: true
+      run: |
+        reg export "HKEY_CLASSES_ROOT\CLSID\{FA1BB90B-53D1-4FDA-8D1F-DEED2700E739}" wsfev1.reg
+        type wsfev1.reg
+    - name: Test WSAA COM server automation
+      run: |
+        .\tests\test_wsaa.ps1
+    - name: Test WSFEv1 COM server automation
+      run: |
+        .\tests\test_wsfev1.ps1
+    - name: Test RECE1 command line interface tool
+      run: |
+        $env:Path += ";$pwd"
+        . .\tests\test_rece1.ps1
+
+  pre-release:
+    name: "Pre Release"
+    needs: compile
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - name: Download distribution binaries
+        uses: actions/download-artifact@v3
+        with:
+          name: dist-x86
+          path: dist-32
+      - name: Create ZIP archive
+        run: |
+          zip dist-32.zip -r dist-32
+      - name: Download distribution binaries
+        uses: actions/download-artifact@v3
+        with:
+          name: dist-x64
+          path: dist-64
+      - name: Create ZIP archive
+        run: |
+          zip dist-64.zip -r dist-64
+      - name: Set release env-vars
+        run: |
+          cat dist-64/.env >> $GITHUB_ENV
+      - uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: ${{ (github.ref_name != 'main') && 'beta' || 'latest' }}
+          prerelease: ${{ (github.ref != 'main') }}
+          title: "Dev Build ${{ env.release_version }} ${{ env.git_branch }} @ ${{ env.git_short_hash }}"
+          files: |
+            dist-32.zip
+            dist-64.zip

README.md

@@ -3,24 +3,20 @@ pyafipws
 
 PyAfipWs contains Python modules to operate with web services regarding AFIP (Argentina's "IRS") and other government agencies, mainly related to electronic invoicing, several taxes and traceability.
 
-Copyright 2008 - 2016 (C) Mariano Reingart [[email protected]](mailto:[email protected]) (creator and maintainter). All rights reserved.
+Copyright 2008 - 2022 (C) Mariano Reingart [[email protected]](mailto:[email protected]) (creator and maintainter). All rights reserved.
 
-License: GPLv3+, with "commercial" exception available to include it and distribute with propietary programs
+License: LGPLv3+, with "commercial" exception available to include it and distribute with propietary programs
 
 General Information:
 --------------------
 
  * Main Project Site: https://github.com/reingart/pyafipws (git repository)
- * Mirror (Historic): https://code.google.com/p/pyafipws/ (mercurial repository)
  * User Manual: (http://www.sistemasagiles.com.ar/trac/wiki/ManualPyAfipWs (Spanish)
  * Documentation: https://github.com/reingart/pyafipws/wiki (Spanish/English)
  * Commercial Support: http://www.sistemasagiles.com.ar/ (Spanish)
  * Community Site: http://www.pyafipws.com.ar/ (Spanish)
  * Public Forum: http://groups.google.com/group/pyafipws (community support, no-charge "gratis" access)
 
-More information at [Python Argentina Magazine article](http://revista.python.org.ar/2/en/html/pyafip.html) (English) 
-and [JAIIO 2012 paper](http://41jaiio.sadio.org.ar/sites/default/files/15_JSL_2012.pdf) (Spanish)
-
 Project Structure:
 ------------------
 
@@ -58,8 +54,6 @@ AFIP:
  * [WSLTV][17b]: agriculture (green tobacco - invoice)
  * [WSLUM][17c]: agriculture (milk - invoice)
  * [WSLSP][17d]: agriculture (cattle/livestock - invoice)
- * [wDigDepFiel][18]: customs (faithful depositary)
- * [WSCOC][19]: currency exchange operations autorization
  * [WSCDC][22]: invoice verification
  * [Taxpayers' Registe][26]: database to check sellers and buyers register
 
@@ -76,39 +70,45 @@ ANMAT/SEDRONAR/SENASA (SNT):
 Installation Instructions:
 --------------------------
 
+Notes:
+ * Python 3.9 is recommended for new apps: https://www.python.org/downloads/
+ * Python 2.7 is still supported for legacy apps but compatibility will be removed soon
+
+You could see the `.github` directory for detailed workflows and automated commands to build the project.
+
 ## Quick-Start
 
-On Ubuntu (GNU/Linux), you will need to install httplib2 and openssl binding.
-Then you can download the compressed file, unzip it and use:
+These instructions are for Ubuntu/Debian. In Windows you can use PowerShell.
 
+You can download the compressed file: https://github.com/reingart/pyafipws/archive/main.zip and unzip it.
+
+Then install dependencies and the project itself:
 ```
-sudo apt-get install python-httplib2 python-m2crypto
-wget https://github.com/reingart/pyafipws/archive/master.zip
-unzip master.zip
-cd pyafipws-master
-sudo pip install -r requirements.txt
+pip download https://github.com/reingart/pyafipws/archive/main.zip
+python -m zipfile -e main.zip  .
+cd pyafipws-main
+pip install -r requirements.txt --user
+python setup.py install
 ```
 
-**Note:** M2Crypto is optional, the library will use OpenSSL directly (using
-subprocess)
-
 You'll need a digital certificate (.crt) and private key (.key) to authenticate 
 (see [certificate generation][29] for more information and instructions).
 Provisionally, you can use author's testing certificate/key:
-
 ```
-wget https://www.sistemasagiles.com.ar/soft/pyafipws/reingart.zip
-unzip reingart.zip
+wget https://www.sistemasagiles.com.ar/soft/pyafipws/reingart.zip -O reingart.zip
+python -m zipfile -e reingart.zip .
 ```
 
-You should configure `rece.ini` to set up paths and URLs if using other values
-than defaults.
+You should copy and configure `rece.ini` to set up paths and URLs:
+```
+cp conf/*.ini .
+```
 
 Then, you could execute `WSAA` script to authenticate (getting Token and Sign)
 and `WSFEv1` to process an electronic invoice:
 ```
-python wsaa.py
-python wsfev1.py --prueba
+python -m pyafipws.wsaa
+python -m pyafipws.wsfev1 --prueba
 ```
 
 With the last command, you should get the Electronic Autorization Code (CAE) 
@@ -120,52 +120,42 @@ The following commands clone the repository, creates a virtualenv and install
 the packages there (including the latest versions of the dependencies) to avoid
 conflicts with other libraries:
 ```
-sudo apt-get install python-dev swig python-virtualenv mercurial python-pip libssl-dev python-dulwich
-hg clone git+https://github.com/reingart/pyafipws.git --config extensions.hggit=
+git clone https://github.com/reingart/pyafipws.git
 cd pyafipws
-virtualenv venv
-source venv/bin/activate
+python -m venv .venv
+. .venv/bin/activate
 pip install -r requirements.txt
+pip install -r requirements-dev.txt
 ```
 
-**Note:** For convenience, development is done using mercurial; 
-You could use [hg-git][30] or git directly. 
+Run `python setup_win.py py2exe` to build in windows and "compile" executables.
+See the GitHub Actions for specific steps and more details.
+
+Just execute `pytest` to run automated Python tests.
+For Windows, see `tests/powershell` directory for Pester tests.
 
 ## Dependency installation (development):
 
 For SOAP webservices [PySimpleSOAP](https://github.com/pysimplesoap/pysimplesoap) is
 needed (spin-off of this library, inspired by the PHP SOAP extension):
 
 ```
-hg clone git+https://github.com/pysimplesoap/pysimplesoap.git --config extensions.hggit=
+git clone https://github.com/pysimplesoap/pysimplesoap.git -b stable_py3k
 cd pysimplesoap
-hg up reingart
 python setup.py install
 ```
 
-Use "stable" branch reingart (see `requirements.txt` for more information)
+Use "stable_py3k" branch reingart (see `requirements.txt` for more information)
 
 For PDF generation, you will need the [PyFPDF](https://github.com/reingart/pyfpdf)
 (PHP's FPDF library, python port):
 
 ```
-hg clone git+https://github.com/reingart/pyfpdf.git --config extensions.hggit=
+git clone https://github.com/reingart/pyfpdf.git
 cd pyfpdf
 python setup.py install
 ```
 
-For the GUI app, you will need [wxPython](http://www.wxpython.org/):
-```
-sudo apt-get install wxpython
-```
-
-PythonCard is being replaced by [gui2py](https://github.com/reingart/gui2py/):
-```
-pip install gui2py
-```
-
-For the WEB app, you will need [web2py](http://www.web2py.com/).
-
 On Windows, you can see available installers released for evaluation purposes on
 [Download Releases](https://github.com/reingart/pyafipws/releases)
 
@@ -192,8 +182,6 @@ For more information see the source code installation steps in the
  [17b]: http://www.sistemasagiles.com.ar/trac/wiki/LiquidacionTabacoVerde
  [17c]: http://www.sistemasagiles.com.ar/trac/wiki/LiquidacionUnicaMensualLecheria
  [17d]: http://www.sistemasagiles.com.ar/trac/wiki/LiquidacionSectorPecuario
- [18]: http://www.sistemasagiles.com.ar/trac/wiki/ManualPyAfipWs#wDigDepFiel:DepositarioFiel
- [19]: http://www.sistemasagiles.com.ar/trac/wiki/ConsultaOperacionesCambiarias
  [20]: http://www.sistemasagiles.com.ar/trac/wiki/RemitoElectronicoCotArba
  [21]: http://www.sistemasagiles.com.ar/trac/wiki/TrazabilidadMedicamentos
  [22]: http://www.sistemasagiles.com.ar/trac/wiki/FacturaElectronicaMTXCAService
@@ -205,4 +193,3 @@ For more information see the source code installation steps in the
  [27]: https://github.com/reingart/openerp_pyafipws
  [28]: https://github.com/tryton-ar/account_invoice_ar
  [29]: http://www.sistemasagiles.com.ar/trac/wiki/ManualPyAfipWs#Certificados
- [30]: http://hg-git.github.io/

conf/rece.ini

@@ -46,7 +46,8 @@ SALIDA=salida.txt
 CUIT=20267565393
 ENTRADA=entrada.txt
 SALIDA=salida.txt
-##URL=https://servicios1.afip.gov.ar/wsfe/service.asmx
+#wrapper=pycurl
+#URL=https://servicios1.afip.gov.ar/wsfexv1/service.asmx?WSDL
 
 [WSCT]
 CUIT=20267565393

cot.py

@@ -28,7 +28,7 @@
 import os, sys, traceback
 from pysimplesoap.simplexml import SimpleXMLElement
 
-from .utils import WebClient
+from pyafipws.utils import WebClient
 
 HOMO = False
 CACERT = "conf/arba.crt"  # establecimiento de canal seguro (en producción)