diff options
author | Harel Ben-Attia <harelba@gmail.com> | 2021-11-26 16:46:51 +0200 |
---|---|---|
committer | Harel Ben-Attia <harelba@gmail.com> | 2021-11-26 16:46:51 +0200 |
commit | a125eacc9a0ba6bd224fceafc57343cc455dc9b1 (patch) | |
tree | deb6d19f2ffa533548dbd07c603530758bdd6888 | |
parent | 12286ad001ee65642e6e3eb5adef774f27142a61 (diff) |
bump to v3.1.4, no mac sha yet in formulacalc-sha-3.1.4
-rw-r--r-- | .github/workflows/build-and-package.yaml | 51 | ||||
-rw-r--r-- | .github/workflows/q.rb.brew-formula-template | 4 | ||||
-rw-r--r-- | README.markdown | 6 | ||||
-rwxr-xr-x | bin/q.py | 2 | ||||
-rw-r--r-- | mkdocs/docs/about.md | 3 | ||||
-rw-r--r-- | mkdocs/docs/index.md | 12 | ||||
-rw-r--r-- | pyoxidizer.bzl | 2 | ||||
-rw-r--r-- | setup.py | 2 |
8 files changed, 42 insertions, 40 deletions
diff --git a/.github/workflows/build-and-package.yaml b/.github/workflows/build-and-package.yaml index 1f16285..bad9b88 100644 --- a/.github/workflows/build-and-package.yaml +++ b/.github/workflows/build-and-package.yaml @@ -2,11 +2,8 @@ name: BuildAndPackage on: push: - branches: master - paths-ignore: - - "*.md" - - "*.markdown" - - "mkdocs/**/*" + tags: + - "v*" # Remove comment in order to pre-release on a PR, to validate packaging flow pull_request: branches: master @@ -139,12 +136,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.3-1.x86_64.deb --version 3.1.3 ./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.4-1.x86_64.deb --version 3.1.4 ./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.3-1.x86_64.deb - path: packages/linux/q-text-as-data-3.1.3-1.x86_64.deb + name: q-text-as-data-3.1.4-1.x86_64.deb + path: packages/linux/q-text-as-data-3.1.4-1.x86_64.deb test-deb-packaging: runs-on: ubuntu-18.04 @@ -155,7 +152,7 @@ jobs: - name: Download DEB uses: actions/download-artifact@v2 with: - name: q-text-as-data-3.1.3-1.x86_64.deb + name: q-text-as-data-3.1.4-1.x86_64.deb - name: Install Python for Testing uses: actions/setup-python@v2 with: @@ -167,7 +164,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.3-1.x86_64.deb + run: ./dist/test-using-deb.sh ./q-text-as-data-3.1.4-1.x86_64.deb package-linux-rpm: needs: [test-linux, create-man] @@ -199,12 +196,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.3.x86_64.rpm --version 3.1.3 ./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.4.x86_64.rpm --version 3.1.4 ./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.3.x86_64.rpm - path: packages/linux/q-text-as-data-3.1.3.x86_64.rpm + name: q-text-as-data-3.1.4.x86_64.rpm + path: packages/linux/q-text-as-data-3.1.4.x86_64.rpm test-rpm-packaging: runs-on: ubuntu-18.04 @@ -215,9 +212,9 @@ jobs: - name: Download RPM uses: actions/download-artifact@v2 with: - name: q-text-as-data-3.1.3.x86_64.rpm + name: q-text-as-data-3.1.4.x86_64.rpm - name: Retest using RPM - run: ./dist/test-using-rpm.sh ./q-text-as-data-3.1.3.x86_64.rpm + run: ./dist/test-using-rpm.sh ./q-text-as-data-3.1.4.x86_64.rpm build-mac: runs-on: macos-11 @@ -308,7 +305,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.3/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.4/g' | sed "s/{{ .Q_BRANCH_NAME }}/${BRANCH_NAME}/g" > ./brew/q.rb echo "Resulting formula:" cat ./brew/q.rb @@ -322,8 +319,8 @@ jobs: - name: Upload Executable uses: actions/upload-artifact@v1.0.0 with: - name: q--3.1.3_1.big_sur.bottle.tar.gz - path: ./q--3.1.3_1.big_sur.bottle.tar.gz + name: q--3.1.4_1.big_sur.bottle.tar.gz + path: ./q--3.1.4_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 +337,7 @@ jobs: - name: Download q bottle uses: actions/download-artifact@v2 with: - name: q--3.1.3_1.big_sur.bottle.tar.gz + name: q--3.1.4_1.big_sur.bottle.tar.gz - name: Test the created bottle run: | set -x -e @@ -349,7 +346,7 @@ jobs: WD=$(pwd) pushd /usr/local/Cellar - tar xvfz ${WD}/q--3.1.3_1.big_sur.bottle.tar.gz + tar xvfz ${WD}/q--3.1.4_1.big_sur.bottle.tar.gz popd brew link q @@ -459,17 +456,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.3.msi + export Q_MSI=./build/x86_64-pc-windows-msvc/release/msi_installer/q-text-as-data-3.1.4.msi chmod 755 $Q_MSI mkdir -p packages/windows/ - cp $Q_MSI packages/windows/q-text-as-data-3.1.3.msi + cp $Q_MSI packages/windows/q-text-as-data-3.1.4.msi - name: Upload Windows MSI uses: actions/upload-artifact@v1.0.0 with: - name: q-text-as-data-3.1.3.msi - path: packages/windows/q-text-as-data-3.1.3.msi + name: q-text-as-data-3.1.4.msi + path: packages/windows/q-text-as-data-3.1.4.msi test-windows-packaging: needs: package-windows @@ -480,12 +477,12 @@ jobs: - name: Download Windows Package uses: actions/download-artifact@v2 with: - name: q-text-as-data-3.1.3.msi + name: q-text-as-data-3.1.4.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.3.msi -l* msi-install.log /norestart /quiet" -PassThru -Wait + $process = Start-Process msiexec.exe -ArgumentList "/i q-text-as-data-3.1.4.msi -l* msi-install.log /norestart /quiet" -PassThru -Wait $process.ExitCode gc msi-install.log @@ -494,7 +491,7 @@ jobs: continue-on-error: true shell: powershell run: | - $process = Start-Process msiexec.exe -ArgumentList "/u q-text-as-data-3.1.3.msi /norestart /quiet" -PassThru -Wait + $process = Start-Process msiexec.exe -ArgumentList "/u q-text-as-data-3.1.4.msi /norestart /quiet" -PassThru -Wait $process.ExitCode exit $process.ExitCode diff --git a/.github/workflows/q.rb.brew-formula-template b/.github/workflows/q.rb.brew-formula-template index 09116e8..52be2de 100644 --- a/.github/workflows/q.rb.brew-formula-template +++ b/.github/workflows/q.rb.brew-formula-template @@ -4,9 +4,9 @@ class Q < Formula desc "Run SQL directly on CSV or TSV files" homepage "https://harelba.github.io/q/" - url "https://github.com/harelba/q/archive/v3.1.3.tar.gz" + url "https://github.com/harelba/q/archive/v3.1.4.tar.gz" - sha256 "a77f8fe0e35d0c24f06493d2cc9beceb1ef9ded5b9bb44b85ef2aa11eadfe9ba" + sha256 "RLRL-UNKNOWN-YET" license "GPL-3.0-or-later" revision 1 diff --git a/README.markdown b/README.markdown index aacdfb6..3d7828e 100644 --- a/README.markdown +++ b/README.markdown @@ -1,6 +1,5 @@ [![Build and Package](https://github.com/harelba/q/workflows/BuildAndPackage/badge.svg?branch=master)](https://github.com/harelba/q/actions?query=branch%3Amaster) - # q - Text as Data q's purpose is to bring SQL expressive power to the Linux command line and to provide easy access to text as actual data. @@ -40,7 +39,7 @@ $ q "select count(*) from some_db.sqlite3:::albums a left join another_db.sqlite Detailed examples are in [here](http://harelba.github.io/q/#examples) ## Installation. -**New Major Version `3.1.3` is out with a lot of significant additions.** +**New Major Version `3.1.4` is out with a lot of significant additions.** Instructions for all OSs are [here](http://harelba.github.io/q/#installation). @@ -57,3 +56,6 @@ Email [harelba@gmail.com](mailto:harelba@gmail.com) q on twitter: [#qtextasdata](https://twitter.com/hashtag/qtextasdata?src=hashtag_click) +Patreon: [harelba](https://www.patreon.com/harelba) - All the money received is donated to the [Center for the Prevention and Treatment of Domestic Violence](https://www.gov.il/he/departments/bureaus/molsa-almab-ramla) in my hometown - Ramla, Israel. + + @@ -35,7 +35,7 @@ from collections import OrderedDict from sqlite3.dbapi2 import OperationalError from uuid import uuid4 -q_version = '3.1.3' +q_version = '3.1.4' #__all__ = [ 'QTextAsData' ] diff --git a/mkdocs/docs/about.md b/mkdocs/docs/about.md index 9da1294..37e3f00 100644 --- a/mkdocs/docs/about.md +++ b/mkdocs/docs/about.md @@ -6,5 +6,8 @@ ### Email [harelba@gmail.com](mailto:harelba@gmail.com) +### Patreon [harelba](https://www.patreon.com/harelba) +All the money received is donated to the [Center for the Prevention and Treatment of Domestic Violence](https://www.gov.il/he/departments/bureaus/molsa-almab-ramla) in my hometown - Ramla, Israel. + ### Chinese translation [jinzhencheng@outlook.com](mailto:jinzhencheng@outlook.com) diff --git a/mkdocs/docs/index.md b/mkdocs/docs/index.md index 29ab2e7..f543d03 100644 --- a/mkdocs/docs/index.md +++ b/mkdocs/docs/index.md @@ -69,12 +69,12 @@ Download the tool using the links in the [installation](#installation) below and | Format | Instructions | Comments | :---|:---|:---| -|[OSX](https://github.com/harelba/q/releases/download/v3.1.3/macos-q)|`brew install` will install the previous `2.0.19` for now, until homebrew approves the new version. In the mean time, you can download the new version executable from the link, `chmod +x` it and then run. You might need to run it the first time from Finder using Right-Click -> Open, and then click the Open button. After the first time, it will run from the command line without any issues. |A man page is available, just run `man q`|| -|[RPM Package](https://github.com/harelba/q/releases/download/v3.1.3/q-text-as-data-3.1.3.x86_64.rpm)| run `rpm -ivh <package-filename>` or `rpm -U <package-filename>` if you already have an older version of q.| A man page is available for this release. Just enter `man q`.| -|[DEB Package](https://github.com/harelba/q/releases/download/v3.1.3/q-text-as-data-3.1.3-1.x86_64.deb)| Run `sudo dpkg -i <package-filename>`|A man page is available for this release. Just enter `man q`. Some installations don't install the man page properly for some reason. I'll fix this soon| -|[Windows Installer](https://github.com/harelba/q/releases/download/v3.1.3/q-text-as-data-3.1.3.msi)|Run the installer executable and hit next next next... q.exe will be added to the PATH so you can access it everywhere.|Windows doesn't update the PATH retroactively for open windows, so you'll need to open a new `cmd`/`bash` window after the installation is done.| -|[Source tar.gz](https://github.com/harelba/q/archive/refs/tags/v3.1.3.tar.gz)|Full source file tree for latest stable version. Note that q.py cannot be used directly anymore, as it requires python dependencies|| -|[Source zip](https://github.com/harelba/q/archive/refs/tags/v3.1.3.zip)|Full source file tree for the latest stable version. Note that q.py cannot be used directly anymore, as it requires python dependencies|| +|[OSX](https://github.com/harelba/q/releases/download/v3.1.4/macos-q)|`brew install` will install the previous `2.0.19` for now, until homebrew approves the new version. In the mean time, you can download the new version executable from the link, `chmod +x` it and then run. You might need to run it the first time from Finder using Right-Click -> Open, and then click the Open button. After the first time, it will run from the command line without any issues. |A man page is available, just run `man q`|| +|[RPM Package](https://github.com/harelba/q/releases/download/v3.1.4/q-text-as-data-3.1.4.x86_64.rpm)| run `rpm -ivh <package-filename>` or `rpm -U <package-filename>` if you already have an older version of q.| A man page is available for this release. Just enter `man q`.| +|[DEB Package](https://github.com/harelba/q/releases/download/v3.1.4/q-text-as-data-3.1.4-1.x86_64.deb)| Run `sudo dpkg -i <package-filename>`|A man page is available for this release. Just enter `man q`. Some installations don't install the man page properly for some reason. I'll fix this soon| +|[Windows Installer](https://github.com/harelba/q/releases/download/v3.1.4/q-text-as-data-3.1.4.msi)|Run the installer executable and hit next next next... q.exe will be added to the PATH so you can access it everywhere.|Windows doesn't update the PATH retroactively for open windows, so you'll need to open a new `cmd`/`bash` window after the installation is done.| +|[Source tar.gz](https://github.com/harelba/q/archive/refs/tags/v3.1.4.tar.gz)|Full source file tree for latest stable version. Note that q.py cannot be used directly anymore, as it requires python dependencies|| +|[Source zip](https://github.com/harelba/q/archive/refs/tags/v3.1.4.zip)|Full source file tree for the latest stable version. Note that q.py cannot be used directly anymore, as it requires python dependencies|| I will add packages for additional Linux Distributions if there's demand for it. If you're interested in another Linux distribution, please ping me. It's relatively easy to add new ones with the new packaging flow. diff --git a/pyoxidizer.bzl b/pyoxidizer.bzl index 22ef5bf..1d84781 100644 --- 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.3", + "3.1.4", # The author/manufacturer of your application. "Harel Ben-Attia" ) @@ -3,7 +3,7 @@ from setuptools import setup import setuptools -q_version = '3.1.3' +q_version = '3.1.4' with open("README.markdown", "r", encoding="utf-8") as fh: long_description = fh.read() |