Skip to content

Commit

Permalink
Merge branch 'release/0.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
turicas committed Feb 14, 2019
2 parents 27ac82f + 973f7fd commit 882ddf8
Show file tree
Hide file tree
Showing 25 changed files with 540 additions and 1,013 deletions.
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.csv
*.db
*.egg-info/
*.pyc
Expand All @@ -16,7 +17,9 @@
.tox
MANIFEST
build/*
data/
dist/*
docs/_build
docs-build/
docs/man/
docs/reference/
reg_settings.py
rows.1
35 changes: 14 additions & 21 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
FROM debian
FROM python:3.7
MAINTAINER Álvaro Justen <https://github.com/turicas>

# install system dependencies
# Install system dependencies
RUN apt-get update
RUN apt-get install --no-install-recommends -y build-essential git locales \
python-dev python-lxml \
python-pip python-snappy \
python-thrift && \
apt-get clean
RUN apt-get install --no-install-recommends -y \
build-essential git locales python3-dev libsnappy-dev \
libxml2-dev libxslt-dev libz-dev && \
apt-get clean && \
pip install --no-cache-dir -U pip

#thrift (used by parquet plugin) is the only which needs build-essential and
#python-dev to be installed (installing python-thrift doesn't do the job).

#You can build other Python libraries from source by installing:
# libsnappy-dev libxml2-dev libxslt-dev libz-dev
#and not installing:
# python-lxml python-snappy

# configure locale (needed to run tests)
# Configure locale (needed to run tests)
RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen
RUN echo 'pt_BR.UTF-8 UTF-8' >> /etc/locale.gen
RUN /usr/sbin/locale-gen

# clone the repository and install Python dependencies
RUN git clone https://github.com/turicas/rows.git ~/rows
RUN cd ~/rows && pip install -r requirements-development.txt && \
rm -rf ~/.cache/pip/
RUN cd ~/rows && pip install -e .
# Clone the repository and install Python dependencies
RUN git clone https://github.com/turicas/rows.git /rows
RUN cd /rows && \
git checkout master && \
pip install --no-cache-dir -r requirements-development.txt && \
pip install --no-cache-dir -e .
28 changes: 19 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ test:
clean:
find -regex '.*\.pyc' -exec rm {} \;
find -regex '.*~' -exec rm {} \;
rm -rf reg-settings.py
rm -rf MANIFEST dist build *.egg-info
rm -rf rows.1
rm -rf .tox
rm -rf reg-settings.py MANIFEST dist build *.egg-info rows.1 .tox
rm -rf docs-build docs/reference docs/man
coverage erase

fix-imports:
Expand All @@ -32,11 +30,23 @@ lint:
lint-tests:
pylint tests/*.py

man:
head -1 rows.1.txt > rows.1
txt2man rows.1.txt | egrep -v '^\.TH' >> rows.1
docs:
make clean install
click-man --target=docs/man/ rows
pycco --directory=docs/reference --generate_index --skip-bad-files rows/*.py
pycco --directory=docs/reference/plugins --generate_index --skip-bad-files rows/plugins/*.py
mkdocs build --strict --site-dir=docs-build
rm -rf docs/man docs/reference

docs-serve: docs
cd docs-build && python3 -m http.server

docs-upload: docs
-git branch --delete --force --quiet gh-pages
-git push turicas :gh-pages
ghp-import --no-jekyll --message="Docs automatically built from $(shell git rev-parse HEAD)" --branch=gh-pages --push --force --remote=turicas docs-build/

release:
python setup.py bdist bdist_wheel bdist_egg upload
python setup.py bdist bdist_wheel --universal bdist_egg upload

.PHONY: test clean fix-imports lint lint-tests install uninstall man release
.PHONY: test clean docs docs-serve docs-upload fix-imports lint lint-tests install uninstall release
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
![Supported Python Versions](https://img.shields.io/pypi/pyversions/rows.svg)
![Software status](https://img.shields.io/pypi/status/rows.svg)
[![License: LGPLv3](https://img.shields.io/pypi/l/rows.svg)](https://github.com/turicas/rows/blob/develop/LICENSE)
[![Donate](https://img.shields.io/gratipay/turicas.svg?style=social&label=Donate)](https://www.gratipay.com/turicas)

No matter in which format your tabular data is: `rows` will import it,
automatically detect types and give you high-level Python objects so you can
start **working with the data** instead of **trying to parse it**. It is also
locale-and-unicode aware. :)

Want to learn more? [Read the documentation](http://turicas.info/rows).
Want to learn more? [Read the documentation](http://turicas.info/rows) (or
build and browse the docs locally by running `make docs-serve` after installing
`requirements-development.txt`).
27 changes: 0 additions & 27 deletions docs/Makefile

This file was deleted.

28 changes: 27 additions & 1 deletion docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,30 @@
# rows' Log of Changes
# Log of Changes

## Version `0.4.2dev0`

**Released on: (in development)**

### General Changes and Enhancements
### Plugins
### Command-Line Interface
### Utils
### Bug Fixes

## Version `0.4.1` (bugfix release)

**Released on: 2019-02-14**

### General Changes and Enhancements

- Add new way to make docs (remove sphinx and uses mkdocs + click-man + pycco)
- Update Dockerfile


### Bug Fixes

- [#305](https://github.com/turicas/rows/issues/305) "0" was not being
deserialized by `IntegerField`


## Version `0.4.0`

Expand Down
Loading

0 comments on commit 882ddf8

Please sign in to comment.