summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarel Ben-Attia <harelba@gmail.com>2014-12-13 06:46:44 -0500
committerHarel Ben-Attia <harelba@gmail.com>2014-12-13 07:10:37 -0500
commitef0ce7c4cf43f438cb2add712b3a80f759eb4742 (patch)
tree8a15b1ae543f1122c7c3ae0556b0f4f331a5b440
parent77d498cfb0772b159d1c5b0c1edab11aa7618ecd (diff)
Final preparations for releasing 1.5.0
* Removing python API artifacts. Will be done properly right after releasing 1.5.0 Doc stuff fixes in preparation for releasing 1.5.0 Revert "Final preparations for releasing 1.5.0" This reverts commit b27ddfd1d13e869a72c77bb0e514f4887c945122.
-rw-r--r--README.markdown9
-rw-r--r--dist/q-text-as-data.spec.template2
-rw-r--r--doc/CHANGELOG.markdown75
-rw-r--r--doc/INSTALL.markdown48
4 files changed, 8 insertions, 126 deletions
diff --git a/README.markdown b/README.markdown
index 5c77fe2..6e2049d 100644
--- a/README.markdown
+++ b/README.markdown
@@ -5,8 +5,10 @@ q treats ordinary files as database tables, and supports all SQL constructs, suc
q's web site is [http://harelba.github.io/q/](http://harelba.github.io/q/). It contains everything you need to download and use q in no time.
-## Download
-Download links for all OSs are [here](http://harelba.github.io/q/install.html).
+## Installation.
+Extremely simple.
+
+Instructions for all OSs are [here](http://harelba.github.io/q/install.html).
## Examples
@@ -17,6 +19,9 @@ Go [here](http://harelba.github.io/q/examples.html) for more examples.
## Python API
A development branch for exposing q's capabilities as a <strong>Python module</strong> can be viewed <a href="https://github.com/harelba/q/tree/expose-as-python-api">here</a>, along with examples of the alpha version of the API.<br/>Existing functionality as a command-line tool will not be affected by this. Your input will be most appreciated.
+## Change log
+Click [here](http://harelba.github.io/q/changelog.html) to see the change log.
+
## Contact
Any feedback/suggestions/complaints regarding this tool would be much appreciated. Contributions are most welcome as well, of course.
diff --git a/dist/q-text-as-data.spec.template b/dist/q-text-as-data.spec.template
index ef24fb9..504cef0 100644
--- a/dist/q-text-as-data.spec.template
+++ b/dist/q-text-as-data.spec.template
@@ -37,7 +37,7 @@ gzip ${RPM_BUILD_ROOT}%{_mandir}/man1/q.1
%files
%defattr(-,root,root,-)
%{_bindir}/q
-%doc README.markdown doc/AUTHORS doc/CHANGELOG.markdown doc/IMPLEMENTATION.markdown doc/INSTALL.markdown doc/LICENSE doc/RATIONALE.markdown doc/THANKS doc/USAGE.markdown
+%doc README.markdown doc/AUTHORS doc/CHANGELOG.markdown doc/IMPLEMENTATION.markdown doc/LICENSE doc/RATIONALE.markdown doc/THANKS doc/USAGE.markdown
%attr(755,root,root) %{_datadir}/q-text-as-data/q
%{_datadir}/q-text-as-data
%doc %_mandir/man1/q.1.gz
diff --git a/doc/CHANGELOG.markdown b/doc/CHANGELOG.markdown
deleted file mode 100644
index 7267f29..0000000
--- a/doc/CHANGELOG.markdown
+++ /dev/null
@@ -1,75 +0,0 @@
-# q - Treating Text as a Database
-
-
-## Change log
-**Fri Dec 12 2014 Harel Ben-Attia <harelba@gmail.com> 1.5.0-1**
-- Full input/output support for double-quoting fields with delimiters
-- Multiple query support in one command line, reusing previously loaded data in subsequent queries
-- Support literal SELECT statements (e.g. SELECT 5+12.5/3)
-- Full code restructuring (Internally working now using a full python API which will become public in the next version)
-- Added sha1 function
-- Solved the following bugs/pull-requests:
- - [#10](../../../issues/10) - Reuse of previously loaded data when running multiple queries in one command line
- - [#64](../../../issues/64) - Full support for literal SELECT statements without a table (e.g. SELECT 5+12.5)
- - [#56](../../../issues/56),[#78](../../../issues/78) - Proper double quote handling, including multiline fields, for both input and output according to csv standards
- - [#69](../../../issues/69) - Added warning suppression when the user provides a specific column count
- - [#40](../../../issues/40) - Code restructuring cleaning, creating a full python API
- - [#60](../../../issues/60) - Fixed RPM packaging
- - [#68](../../../issues/68) - UTF-8 with BOM files cause column naming issues
- - [#63](../../../issues/63) - Unicode string support in regexp function
-**Sat Jun 14 2014 Harel Ben-Attia <harelba@gmail.com> 1.4.0-1**
-- 2.5x Speed improvement due to better bulk loading
-- Output header support
-- Additional control over query and output encodings
-- Solved the following bugs/pull-requests:
- - [#52](../../../issues/52) - Bulk insert for better performance
- - [#55](../../../issues/55) - Use UUID to ensure temporary table names don't clash
- - [#53](../../../issues/53) - Allow easier tab-delimited output
- - [#51](../../../issues/51) - Ensure that generated temp tables are uniquely named
- - [#50](../../../issues/50) - Copyright peculiarities
- - [#49](../../../issues/49) - Add option to output fieldnames as headers
- - [#48](../../../issues/48) - PEP 8
- - [#47](../../../issues/47) - Prevent regexp from failing when field value is null
- - [#41](../../../issues/41) - Fix project folder structure
- - [#32](../../../issues/32) - Remove duplicated definitions, and PEP8-ing (tabs to spaces, etc.)
- - [#29](../../../issues/29) - RPM: Source0 should be a URL
- - [#54](../../../issues/54) - Fix query encoding (data encoding works well)
-
-**Thu Mar 03 2014 Harel Ben-Attia <harelba@gmail.com> 1.3.0-1**
-- Added column name and type detection (Use -A to see name/type analysis for the specified input)
-- Added support for multiple parsing modes - Relaxed, Strict and Fluffy (old, backward compatible behavior)
-- Fixed tab delimition parameter problem
-- More improvements to error reporting
-- Added a test suite, in preparation for refactoring
-- Solves the following bugs/pull-requests:
- - [#7](../../../issues/7) - Dynamic column count support
- - [#8](../../../issues/8) - Column name inference from input containing a header row
- - [#9](../../../issues/9) - Automatic column type inference using sample data
- - [#30](../../../issues/30) - Header lines option does nothing
- - [#33](../../../issues/33) - Last column should allow for spaces?
- - [#35](../../../issues/35) - Add q.bat
- - [#38](../../../issues/38) - Problem with whitespace delimiter
- - [#43](../../../issues/43) - using the -t flag stopped the header flag from working
- - [#44](../../../issues/44) - Space in column name on TAB separated values break q
-- Breaking changes:
- - Changed -H behavior so it's now a flag an not a parameter (1 line always)
- - Removed support for multi-char delimiters
-
-**Sat Feb 22 2014 Harel Ben-Attia <harelba@gmail.com> 1.2.0-1**
-- Support for quoted fields in CSVs
-- Some bug fixes
-- Improved error reporting
-
-**Thu Feb 20 2014 Harel Ben-Attia <harelba@gmail.com> 1.1.7-1**
-- Better error reporting
-- Fixed python invocation for non stanard locations
-- Added man page
-
-**Tue Jan 7 2014 Harel Ben-Attia <harelba@gmail.com> 1.0.0-1**
-- Initial version - tag was needed for homebrew formula
-
-## Contact
-Any feedback/suggestions/complaints regarding this tool would be much appreciated. Contributions are most welcome as well, of course.
-
-Harel Ben-Attia, harelba@gmail.com, [@harelba](https://twitter.com/harelba) on Twitter
-
diff --git a/doc/INSTALL.markdown b/doc/INSTALL.markdown
deleted file mode 100644
index 4f1c3a7..0000000
--- a/doc/INSTALL.markdown
+++ /dev/null
@@ -1,48 +0,0 @@
-# q - Treating Text as a Database
-
-## Requirements
-* Just Python 2.5 and up or Python 2.4 with sqlite3 module installed. Python 3.x is not supported yet.
-
-## Installation
-Current stable version is `1.4.0`.
-
-Requirements: Just Python 2.5 and up or Python 2.4 with sqlite3 module installed. Python 3.x is not supported yet.
-
-### Mac Users
-Make sure you run `brew update` first and then just run `brew install q`.
-
-Thanks [@stuartcarnie](https://github.com/stuartcarnie) for the initial homebrew formula
-
-### Manual installation (very simple, since there are no dependencies)
-
-1. Download the main q executable from **[here](https://raw.github.com/harelba/q/1.4.0/bin/q)** into a folder in the PATH.
-2. Make the file executable.
-
-For `Windows` machines, also download q.bat **[here](https://raw.github.com/harelba/q/1.4.0/bin/q.bat)** into the same folder and use it to run q.
-
-### RPM-Base Linux distributions
-Download the version `1.4.0` RPM here **[here](https://github.com/harelba/packages-for-q/raw/master/rpms/q-text-as-data-1.4.0-1.noarch.rpm)**.
-
-Install using `rpm -ivh <rpm-name>`.
-
-RPM Releases also contain a man page. Just enter `man q`.
-
-**NOTE** In Version `1.4.0`, the RPM package name has been changed. If you already have the old version, just remove it with `rpm -e q` before installing.
-
-### Debian-based Linux distributions
-Debian packaing is in progress. In the mean time install manually. See the section above.
-
-### Arch Linux
-
-A `PKGBUILD` is [available](https://aur.archlinux.org/packages/q/) in AUR for Arch Linux users. See [installing packages](https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages) in the wiki or use your favorite [AUR helper](https://wiki.archlinux.org/index.php/Aur_helpers).
-
-The man page is also provided (extracted _as is_ from the RPM): `man q`
-
-## Default settings file
-q supports an option file in ~/.qrc or in the working directory (with the name .qrc) which provides defaults for some or all of the command line options. A sample .qrc file with commented-out options is included. Just put it in your home folder and modify it according to your needs.
-
-## Contact
-Any feedback/suggestions/complaints regarding this tool would be much appreciated. Contributions are most welcome as well, of course.
-
-Harel Ben-Attia, harelba@gmail.com, [@harelba](https://twitter.com/harelba) on Twitter
-