Skip to content

Commit

Permalink
Merge pull request #3 from cdgriffith/develop
Browse files Browse the repository at this point in the history
Upgrade to 0.3.0
  • Loading branch information
cdgriffith committed Apr 27, 2016
2 parents 6b78720 + 35568d8 commit 7ac1c13
Show file tree
Hide file tree
Showing 27 changed files with 1,215 additions and 439 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,8 @@ nosetests.xml
.mr.developer.cfg
.project
.pydevproject
.pypirc
.pypirc

*.exe
.eggs/
index.rst
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@ language: python
python:
- "2.6"
- "2.7"
- "3.2"
- "3.3"
- "3.4"
- "3.5"
- "pypy"
before_install:
- sudo apt-get -qq update
- sudo apt-get install -y unrar
install:
- pip install -r requirements.txt
- pip install -r requirements-test.txt
- pip install coveralls
script:
Expand Down
10 changes: 10 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
Changelog
=========

Version 0.3.0
-------------

- Namespace re-written to be more compatible with built-in dict
- Added support for rarfile extraction
- Adding PY2, PY3 as compliments of the booleans python3x to be similar to the six package
- Adding logging features
- Separating functionality to individual files
- Adding sphinx generated API documentation

Version 0.2.0
-------------

Expand Down
31 changes: 21 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ HOME ?= $HOME
CWD = $(shell pwd)
VENVS ?= $(HOME)/.virtualenvs
PYTHON2 = $(VENVS)/builder2.7/bin/python2.7
PYTHON3 = $(VENVS)/builder3.4/bin/python3.4
PYTHONS = $(VENVS)/builder2.6/bin/python2.6 $(VENVS)/builder2.7/bin/python2.7 $(VENVS)/builder3.2/bin/python3.2 $(VENVS)/builder3.3/bin/python3.3 $(VENVS)/builder3.4/bin/python3.4
PYTHON3 = $(VENVS)/builder3.5/bin/python3.5
PYTHONS = $(VENVS)/builder2.6/bin/python2.6 $(VENVS)/builder2.7/bin/python2.7 $(VENVS)/builder3.5/bin/python3.5 $(VENVS)/builder3.3/bin/python3.3 $(VENVS)/builder3.4/bin/python3.4
PYPY = $(VENVS)/builderpypy/bin/python

.PHONY: all test clean help register build

Expand All @@ -30,11 +31,12 @@ test:

build:
$(PYTHON2) setup.py sdist;
for python in $(PYTHONS); do\
"$$python" setup.py bdist_egg; \
done
$(PYTHON2) setup.py bdist_wheel;
$(PYTHON3) setup.py bdist_wheel;
# for python in $(PYTHONS); do\
"$$python" setup.py bdist_egg; \
done


register:
$(PYTHON2) setup.py register;
Expand All @@ -44,12 +46,13 @@ install:

upload: clean test register build
$(PYTHON2) setup.py sdist upload;
for python in $(PYTHONS); do\
"$$python" setup.py bdist_egg upload; \
done
$(PYTHON2) setup.py bdist_wheel upload;
$(PYTHON3) setup.py bdist_wheel upload;

# for python in $(PYTHONS); do\
"$$python" setup.py bdist_egg upload; \
done

help:
@echo "Reusables"
@echo ""
Expand All @@ -63,5 +66,13 @@ help:
develop:
sudo add-apt-repository ppa:fkrull/deadsnakes;
sudo apt-get update;
sudo apt-get install python2.6 python2.7 python3.2 python3.3 python3.4 pypy;

sudo apt-get install python2.6 python2.7 python3.5 python3.3 python3.4 pypy;
sudo pip install virtualenv --upgrade;
rm -rf $(VENVS);
mkdir -p $(VENVS);
virtualenv -p python2.6 $(VENVS)/builder2.6;
virtualenv -p python2.7 $(VENVS)/builder2.7;
virtualenv -p python3.3 $(VENVS)/builder3.3;
virtualenv -p python3.4 $(VENVS)/builder3.4;
virtualenv -p python3.5 $(VENVS)/builder3.5;
virtualenv -p pypy $(VENVS)/builderpypy;
Loading

0 comments on commit 7ac1c13

Please sign in to comment.