diff --git a/.gitmodules b/.gitmodules index 9196579..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "bibble"] - path = bibble - url = https://github.com/sampsyo/bibble.git diff --git a/Makefile b/Makefile index 914fc00..65ba95e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -PYTHON=python2.7 - # targets that aren't filenames .PHONY: all clean deploy @@ -9,9 +7,11 @@ BUILDARGS := _site/index.html _site/wacas14/index.html: jekyll build $(BUILDARGS) +BIBBLE=bibble + _includes/pubs.html: bib/pubs.bib bib/publications.tmpl mkdir -p _includes - $(PYTHON) bibble/bibble.py $+ > $@ + $(BIBBLE) $+ > $@ _site/index.html: $(wildcard *.html) _includes/pubs.html _config.yml \ _layouts/default.html diff --git a/README.md b/README.md index ec64270..d7fb1c5 100644 --- a/README.md +++ b/README.md @@ -31,9 +31,9 @@ Features Setup ----- -1. Install the dependencies. You will need [Python][], [Pybtex][] (`pip install pybtex`), and [Jekyll][] (`gem install jekyll`). +1. Install the dependencies. You will need [Python][], [bibble][] (`pip install bibble`), and [Jekyll][] (`gem install jekyll`). 2. [Fork][] this repository on GitHub. -3. Clone the fork (along with its submodules) to your own machine: `git clone --recursive git@github.com:yourgroup/research-group-web.git`. +3. Clone the fork to your own machine: `git clone git@github.com:yourgroup/research-group-web.git`. 4. Add an "upstream" remote for the original repository so you can stay abreast of bugfixes: `git remote add upstream git://github.com/uwsampa/research-group-web.git`. 5. Customize. Start with the `_config.yml` file, where you enter the name of the site and its URL. 6. Type `make` to build the site and then run `jekyll serve -w` to view your site. @@ -88,10 +88,7 @@ Building The requirements for building the site are: * [Jekyll][]: run `gem install jekyll` -* [Pybtex][]: run `pip install pybtex` -* [bibble][]: included as a submodule. Because git is cruel, you need to use - `git clone --recursive URL` or issue the commands `git submodule init ; git - submodule update` to check out the dependency. +* [bibble][]: available on `pip` * ssh and rsync, only if you want to deploy directly. `make` compiles the bibliography and the website content to the `_site` @@ -108,4 +105,3 @@ To upload a new version of the site via rsync over ssh, type `make deploy`. A we [Jekyll]: http://jekyllrb.com/ [bibble]: https://github.com/sampsyo/bibble/ -[pybtex]: http://pybtex.sourceforge.net diff --git a/bibble b/bibble deleted file mode 160000 index f459839..0000000 --- a/bibble +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f459839d1697a73f907133ac73c2cc9ea007f5d5