update references to package name/location in preparation for merging…

… back into upstream rdflib-sqlalchemy repo

.travis.yml

@@ -0,0 +1,32 @@
+language: python
+env:
+- DB=pgsql
+- DB=mysql
+- DB=sqlite
+python:
+- 2.6
+- 2.7
+- 3.3
+- 3.4
+- 3.5
+install:
+- pip install -U setuptools tox tox-travis
+before_script:
+- sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS test;' -U postgres;
+  psql -c 'create database test;' -U postgres; export DBURI='postgresql+psycopg2://postgres@localhost/test';
+  fi"
+- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS test';
+  export DBURI='mysql+mysqldb://test@localhost/test?charset=utf8'; fi"
+- sh -c "if [ '$DB' = 'sqlite' ]; then export DBURI='sqlite:///%(here)s/test.sqlite';
+  fi"
+script: tox
+deploy:
+  distributions: sdist bdist_wheel
+  provider: pypi
+  user: adamhadani
+  password:
+    secure: Lylx+2lisa4KPZBqXDcA6Kxf2WN7t1QjK/XBhbQdNM29Dt7CZysLD4cnZQnIiECRP6CP/34OP8KrzjUbB9a1AIgI4k20yXtRY/7l9WvQrHuFG0xNsAWhboM5ZFieJi9u1o+fr6MlqZcnNVV8ouwfJTwIlpLMOkEXxDgp8z3BBCjC3ykB35VyQs1crMDezloyTVcY6XaZxs9mMDBbykL1GScwl4a1pOVgqrvlnfwuhM663NbrkySSjLqzE/seBu/a058SO4nB7kE1UCPx6NQ4WwUGLkcu7bTWNJFOlIQzh5Va3NBmnq6WdGrLgxCQ3OSkW5cvX+qZAklUFsLS23tzT8yc0MsS9LOeTbPuVsa7eEsgNzwwkZT2Wwg56qEcM+lGtV8f5TKvBmPsEdTzGSQTPHjRRNBko8HhLSGFSWkpPDXlvygXsX7sorPWhOstN/fYmj1beTAQWfpwjIWtqaS3qgTDrZvdTmACj6iCD1e/SjY8RpwIbM1fXS+qYcB+YzNQzCliIgv2Qh6xDbgqXBJiBudCmgGgYtngW2Df/NjWQrBYAkEHFHjl1twJu7m+ra8xT+MMULyIlaoF7G0550C0oZxsYh8kmYDvOW7NMyVnKWeAYzU1uEBjBtq24zmx/6iB45RAQdbYFSEArRi58kQf6feEeqohWhHCjg6054YCAQQ=
+  on:
+    tags: true
+    condition: $TRAVIS_PYTHON_VERSION = "3.5"
+    branch: develop

README.md

@@ -1,12 +1,6 @@
 RDFLib-SQLAlchemy
 =================
 
-NOTE: This is a fork of the original [rdflib-sqlalchemy](https://github.com/rdflib/rdflib-sqlalchemy). To install this fork instead of the original version with pip, use:
-
-	pip install rdflib-sqlalchemy-redux
-
----
-
 A SQLAlchemy-backed, formula-aware RDFLib Store. It stores its triples
 in the following partitions:
 
@@ -43,15 +37,15 @@ Github repository: https://github.com/RDFLib/rdflib-sqlalchemy
 
 Continuous integration: https://travis-ci.org/RDFLib/rdflib-sqlalchemy/
 
-![Travis CI](https://travis-ci.org/globality-corp/rdflib-sqlalchemy.png?branch=develop)
-![PyPI](https://img.shields.io/pypi/v/rdflib-sqlalchemy-redux.svg)
-![PyPI](https://img.shields.io/pypi/status/rdflib-sqlalchemy-redux.svg)
-![PyPI](https://img.shields.io/pypi/dw/rdflib-sqlalchemy-redux.svg)
+![Travis CI](https://travis-ci.org/RDFLib/rdflib-sqlalchemy.png?branch=develop)
+![PyPI](https://img.shields.io/pypi/v/rdflib-sqlalchemy.svg)
+![PyPI](https://img.shields.io/pypi/status/rdflib-sqlalchemy.svg)
+![PyPI](https://img.shields.io/pypi/dw/rdflib-sqlalchemy.svg)
 
-![PyPI](https://img.shields.io/pypi/pyversions/rdflib-sqlalchemy-redux.svg)
-![PyPI](https://img.shields.io/pypi/l/rdflib-sqlalchemy-redux.svg)
-![PyPI](https://img.shields.io/pypi/wheel/rdflib-sqlalchemy-redux.svg)
-![PyPI](https://img.shields.io/pypi/format/rdflib-sqlalchemy-redux.svg)
+![PyPI](https://img.shields.io/pypi/pyversions/rdflib-sqlalchemy.svg)
+![PyPI](https://img.shields.io/pypi/l/rdflib-sqlalchemy.svg)
+![PyPI](https://img.shields.io/pypi/wheel/rdflib-sqlalchemy.svg)
+![PyPI](https://img.shields.io/pypi/format/rdflib-sqlalchemy.svg)
 
 
 An illustrative unit test:

rdflib_sqlalchemy/__init__.py

@@ -4,7 +4,7 @@
 from pkg_resources import get_distribution
 
 
-__version__ = get_distribution("rdflib_sqlalchemy_redux").version
+__version__ = get_distribution("rdflib_sqlalchemy").version
 
 
 class NullHandler(logging.Handler):

setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup
 
 
-project = "rdflib-sqlalchemy-redux"
+project = "rdflib-sqlalchemy"
 version = "0.3.4"
 
 
@@ -12,9 +12,9 @@
     description="rdflib extension adding SQLAlchemy as an AbstractSQLStore back-end store",
     author="Graham Higgins, Adam Ever-Hadani",
     author_email="gjhiggins@gmail.com, adamhadani@globality.com",
-    url="http://github.com/globality-corp/rdflib-sqlalchemy",
+    url="http://github.com/RDFLib/rdflib-sqlalchemy",
     packages=["rdflib_sqlalchemy"],
-    download_url="https://github.com/globality-corp/rdflib-sqlalchemy/zipball/master",
+    download_url="https://github.com/RDFLib/rdflib-sqlalchemy/zipball/master",
     license="BSD",
     platforms=["any"],
     long_description="""