Fix bug with output header default value parsing in .qrc + Bump Beta …

…Version (#285)
harelba · Oct 24, 2021 · 37c2ed6 · 37c2ed6
1 parent 8282679
commit 37c2ed6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/build-and-package.yaml b/.github/workflows/build-and-package.yaml
@@ -139,12 +139,12 @@ jobs:
 
         gem install fpm
         cp dist/fpm-config ~/.fpm
-        fpm -s dir -t deb --deb-use-file-permissions -p packages/linux/q-text-as-data-3.1.0-beta-1.x86_64.deb --version 3.1.0-beta ./linux-q=/usr/bin/q USAGE.gz=/usr/share/man/man1/q.1.gz
+        fpm -s dir -t deb --deb-use-file-permissions -p packages/linux/q-text-as-data-3.1.1-beta-1.x86_64.deb --version 3.1.1-beta ./linux-q=/usr/bin/q USAGE.gz=/usr/share/man/man1/q.1.gz
     - name: Upload DEB Package
       uses: actions/upload-artifact@v1.0.0
       with:
-        name: q-text-as-data-3.1.0-beta-1.x86_64.deb
-        path: packages/linux/q-text-as-data-3.1.0-beta-1.x86_64.deb
+        name: q-text-as-data-3.1.1-beta-1.x86_64.deb
+        path: packages/linux/q-text-as-data-3.1.1-beta-1.x86_64.deb
 
   test-deb-packaging:
     runs-on: ubuntu-18.04
@@ -155,7 +155,7 @@ jobs:
     - name: Download DEB
       uses: actions/download-artifact@v2
       with:
-        name: q-text-as-data-3.1.0-beta-1.x86_64.deb
+        name: q-text-as-data-3.1.1-beta-1.x86_64.deb
     - name: Install Python for Testing
       uses: actions/setup-python@v2
       with:
@@ -167,7 +167,7 @@ jobs:
 
         pip3 install -r test-requirements.txt
     - name: Test DEB Package Installation
-      run: ./dist/test-using-deb.sh ./q-text-as-data-3.1.0-beta-1.x86_64.deb
+      run: ./dist/test-using-deb.sh ./q-text-as-data-3.1.1-beta-1.x86_64.deb
 
   package-linux-rpm:
     needs: [test-linux, create-man]
@@ -199,12 +199,12 @@ jobs:
 
         gem install fpm
         cp dist/fpm-config ~/.fpm
-        fpm -s dir -t rpm --rpm-use-file-permissions -p packages/linux/q-text-as-data-3.1.0-beta.x86_64.rpm --version 3.1.0-beta ./linux-q=/usr/bin/q USAGE.gz=/usr/share/man/man1/q.1.gz
+        fpm -s dir -t rpm --rpm-use-file-permissions -p packages/linux/q-text-as-data-3.1.1-beta.x86_64.rpm --version 3.1.1-beta ./linux-q=/usr/bin/q USAGE.gz=/usr/share/man/man1/q.1.gz
     - name: Upload RPM Package
       uses: actions/upload-artifact@v1.0.0
       with:
-        name: q-text-as-data-3.1.0-beta.x86_64.rpm
-        path: packages/linux/q-text-as-data-3.1.0-beta.x86_64.rpm
+        name: q-text-as-data-3.1.1-beta.x86_64.rpm
+        path: packages/linux/q-text-as-data-3.1.1-beta.x86_64.rpm
 
   test-rpm-packaging:
     runs-on: ubuntu-18.04
@@ -215,9 +215,9 @@ jobs:
     - name: Download RPM
       uses: actions/download-artifact@v2
       with:
-        name: q-text-as-data-3.1.0-beta.x86_64.rpm
+        name: q-text-as-data-3.1.1-beta.x86_64.rpm
     - name: Retest using RPM
-      run: ./dist/test-using-rpm.sh ./q-text-as-data-3.1.0-beta.x86_64.rpm
+      run: ./dist/test-using-rpm.sh ./q-text-as-data-3.1.1-beta.x86_64.rpm
 
   build-mac:
     runs-on: macos-11
@@ -308,7 +308,7 @@ jobs:
         export BRANCH_NAME=master
 
         # TODO temp, since template rendering action doesn't work in mac
-        cat .github/workflows/q.rb.brew-formula-template | sed 's/{{ .Q_VERSION }}/3.1.0-beta/g' | sed "s/{{ .Q_BRANCH_NAME }}/${BRANCH_NAME}/g" > ./brew/q.rb
+        cat .github/workflows/q.rb.brew-formula-template | sed 's/{{ .Q_VERSION }}/3.1.1-beta/g' | sed "s/{{ .Q_BRANCH_NAME }}/${BRANCH_NAME}/g" > ./brew/q.rb
 
         echo "Resulting formula:"
         cat ./brew/q.rb
@@ -322,8 +322,8 @@ jobs:
     - name: Upload  Executable
       uses: actions/upload-artifact@v1.0.0
       with:
-        name: q--3.1.0-beta_1.big_sur.bottle.tar.gz
-        path: ./q--3.1.0-beta_1.big_sur.bottle.tar.gz
+        name: q--3.1.1-beta_1.big_sur.bottle.tar.gz
+        path: ./q--3.1.1-beta_1.big_sur.bottle.tar.gz
 
 # TODO auto-create PR to main homebrew-core
 #        git clone https://github.com/harelba/homebrew-core.git
@@ -340,7 +340,7 @@ jobs:
     - name: Download q bottle
       uses: actions/download-artifact@v2
       with:
-        name: q--3.1.0-beta_1.big_sur.bottle.tar.gz
+        name: q--3.1.1-beta_1.big_sur.bottle.tar.gz
     - name: Test the created bottle
       run: |
         set -x -e
@@ -349,7 +349,7 @@ jobs:
         WD=$(pwd)
 
         pushd /usr/local/Cellar
-        tar xvfz ${WD}/q--3.1.0-beta_1.big_sur.bottle.tar.gz
+        tar xvfz ${WD}/q--3.1.1-beta_1.big_sur.bottle.tar.gz
         popd
 
         brew link q
@@ -459,17 +459,17 @@ jobs:
 
         # TODO Windows versions do not support the -beta postfix
 
-        export Q_MSI=./build/x86_64-pc-windows-msvc/release/msi_installer/q-text-as-data-3.1.0.msi
+        export Q_MSI=./build/x86_64-pc-windows-msvc/release/msi_installer/q-text-as-data-3.1.1.msi
         chmod 755 $Q_MSI
 
         mkdir -p packages/windows/
-        cp $Q_MSI packages/windows/q-text-as-data-3.1.0.msi
+        cp $Q_MSI packages/windows/q-text-as-data-3.1.1.msi
 
     - name: Upload Windows MSI
       uses: actions/upload-artifact@v1.0.0
       with:
-        name: q-text-as-data-3.1.0.msi
-        path: packages/windows/q-text-as-data-3.1.0.msi
+        name: q-text-as-data-3.1.1.msi
+        path: packages/windows/q-text-as-data-3.1.1.msi
 
   test-windows-packaging:
     needs: package-windows
@@ -480,12 +480,12 @@ jobs:
     - name: Download Windows Package
       uses: actions/download-artifact@v2
       with:
-        name: q-text-as-data-3.1.0.msi
+        name: q-text-as-data-3.1.1.msi
     - name: Test Install of MSI
       continue-on-error: true
       shell: powershell
       run: |
-        $process = Start-Process msiexec.exe -ArgumentList "/i q-text-as-data-3.1.0.msi -l* msi-install.log /norestart /quiet" -PassThru -Wait
+        $process = Start-Process msiexec.exe -ArgumentList "/i q-text-as-data-3.1.1.msi -l* msi-install.log /norestart /quiet" -PassThru -Wait
         $process.ExitCode
         gc msi-install.log
 
@@ -494,7 +494,7 @@ jobs:
       continue-on-error: true
       shell: powershell
       run: |
-        $process = Start-Process msiexec.exe -ArgumentList "/u q-text-as-data-3.1.0.msi /norestart /quiet" -PassThru -Wait
+        $process = Start-Process msiexec.exe -ArgumentList "/u q-text-as-data-3.1.1.msi /norestart /quiet" -PassThru -Wait
         $process.ExitCode
         exit $process.ExitCode
 

diff --git a/bin/q.py b/bin/q.py
@@ -35,7 +35,7 @@
 from sqlite3.dbapi2 import OperationalError
 from uuid import uuid4
 
-q_version = '3.1.0-beta'
+q_version = '3.1.1-beta'
 
 #__all__ = [ 'QTextAsData' ]
 
@@ -3279,7 +3279,7 @@ def initialize_command_line_parser(p, qrc_filename):
         default_output_delimiter = get_option_with_default(p, 'string', 'output_delimiter', None)
         default_pipe_delimited_output = get_option_with_default(p, 'boolean', 'pipe_delimited_output', False)
         default_tab_delimited_output = get_option_with_default(p, 'boolean', 'tab_delimited_output', False)
-        default_output_header = get_option_with_default(p, 'string', 'output_header', False)
+        default_output_header = get_option_with_default(p, 'boolean', 'output_header', False)
         default_beautify = get_option_with_default(p, 'boolean', 'beautify', False)
         default_formatting = get_option_with_default(p, 'string', 'formatting', None)
         default_output_encoding = get_option_with_default(p, 'string', 'output_encoding', 'none')

diff --git a/pyoxidizer.bzl b/pyoxidizer.bzl
@@ -61,7 +61,7 @@ def make_msi(exe):
         # The name of your application.
         "q-text-as-data",
         # The version of your application.
-        "3.1.0",
+        "3.1.1",
         # The author/manufacturer of your application.
         "Harel Ben-Attia"
     )

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup
 import setuptools
 
-q_version = '3.1.0-beta'
+q_version = '3.1.1-beta'
 
 with open("README.markdown", "r", encoding="utf-8") as fh:
     long_description = fh.read()