Merge branch 'master' into cc0-da-legalcode

Author: TimidRobot

.gitignore

@@ -1,57 +1,17 @@
-cc-wp-theme
-vendor
-composer.phar
-python_env/bin
-!python_env/bin/ccengine.fcgi.in
-python_env/build
-python_env/include
-python_env/lib
-python_env/local
-python_env/paste_errors.log
-python_env/.Python
-python_env/src/
-docroot/license.rdf
-docroot/license_rdf
+# symantic web symlinks
 docroot/rdf
-docroot/wp-content/
-docroot/wordpress/
-#docroot/sitemap.*
-docroot/wp-config-local.php
-vendor/*# -*- mode: gitignore; -*-
-*~
-\#*\#
-/.emacs.desktop
-/.emacs.desktop.lock
-*.elc
-#*.apk
-*.exe
-*.dmg
-auto-save-list
-tramp
-.\#*
-*.swp
-
-# Org-mode
-.org-id-locations
-*_archive
-
-# flymake-mode
-*_flymake.*
-
-# eshell files
-/eshell/history
-/eshell/lastdir
-
-# elpa packages
-/elpa/
-
-# reftex files
-*.rel
+docroot/license_rdf
+docroot/cc.licenserdf
 
-# AUCTeX auto folder
-/auto/
+# repositories
+python_src/rdfadict/
+python_src/cc.licenserdf/
+python_src/cc.license/
+python_src/cc.i18n/
+python_src/cc.engine/
 
-# apitest
-/apitest/node_modules
+# transstats.csv symlink
+transstats.csv
 
-.DS_Store
+# vim
+*.swp

.venv/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

CODE_OF_CONDUCT.md

@@ -8,6 +8,6 @@ project and all other Creative Commons open source projects are governed by our
 
 For a history of updates, see the [page history here][updates].
 
-[code_of_conduct]:https://creativecommons.github.io/community/code-of-conduct/
-[reporting_guide]:https://creativecommons.github.io/community/code-of-conduct/enforcement/
-[updates]:https://github.com/creativecommons/creativecommons.github.io-source/commits/master/content/community/code-of-conduct/contents.lr
+[code_of_conduct]:https://opensource.creativecommons.org/community/code-of-conduct/
+[reporting_guide]:https://opensource.creativecommons.org/community/code-of-conduct/enforcement/
+[updates]:https://github.com/creativecommons/creativecommons.github.io-source/commits/master/content/community/code-of-conduct/contents.lr

CONTRIBUTING.md

@@ -8,7 +8,7 @@ a set of guidelines to help you contribute to this project.
 By participating in this project, you are expected to uphold our [Code of
 Conduct][code_of_conduct].
 
-[code_of_conduct]:https://creativecommons.github.io/community/code-of-conduct/
+[code_of_conduct]:https://opensource.creativecommons.org/community/code-of-conduct/
 
 ## Project Documentation
 
@@ -22,10 +22,10 @@ you'd like to see documented.
 Please follow the processes in our general [Contributing Code][contributing]
 guidelines on the Creative Common Open Source website.
 
-[contributing]:https://creativecommons.github.io/contributing-code/
+[contributing]:https://opensource.creativecommons.org/contributing-code/
 
 ## Questions or Thoughts?
 
 Talk to us on [one of our community forums][community].
 
-[community]:https://creativecommons.github.io/community/
+[community]:https://opensource.creativecommons.org/community/

Pipfile

@@ -0,0 +1,29 @@
+# pipenv alone does not setup the License Engine. See scripts/setup_engine.sh
+# and README.md
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+
+[packages]
+    [packages."cc.engine"]
+        editable = true
+        path = "python_src/cc.engine"
+    [packages."cc.i18n"]
+        editable = true
+        path = "python_src/cc.i18n"
+    [packages."cc.license"]
+        editable = true
+        path = "python_src/cc.license"
+    [packages."cc.licenserdf"]
+        editable = true
+        path = "python_src/cc.licenserdf"
+    [packages.future]
+    [packages.rdfadict]
+        editable = true
+        path = "python_src/rdfadict"
+
+[requires]
+python_version = "2.7"