Merge remote-tracking branch 'origin/development'

Merge branch 'development'
merge python 0.12.3 release
2016-12-14 17:23:09 +01:00 · 2016-12-13 18:13:14 +01:00 · 2016-12-12 17:54:02 +01:00 · 2016-12-12 17:42:46 +01:00
1 changed files with 4 additions and 2 deletions
--- a/server/lib/python/cartodb_services/README.md
+++ b/server/lib/python/cartodb_services/README.md
@@ -46,5 +46,7 @@ cd $(git rev-parse --show-toplevel)/test
 python run_tests.py --host=$YOUR_HOST $YOUR_USERNAME $YOUR_API_KEY
 ```

-## TODO
- Move dependencies expressed in `requirements.txt` to `setup.py`
+## Versioning
+Once you're satisfied with your changes, it is time to bump the version number in the `setup.py`. A couple of rules:
+- **Backwards compatibility**: in general all changes shall be backwards compatible. Do not remove any code used from the server public `pl/python` functions or you'll run into problems when deploying.
+- **Semantic versioning**: we try to stick to [Semantic Versioning 2.0.0](http://semver.org/spec/v2.0.0.html)
Author	SHA1	Message	Date
Rafa de la Torre	5b8fd70bdd	Merge remote-tracking branch 'origin/development'	2016-12-14 17:23:09 +01:00
Javier Goizueta	55a467f2df	Merge branch 'development' merge python 0.12.3 release	2016-12-13 18:13:14 +01:00
Rafa de la Torre	0adb5164d7	Update README.md Add a bit about versioning stuff	2016-12-12 17:54:02 +01:00
Rafa de la Torre	147e0ab567	Update README.md Remove misleading paragraph about `requirements.txt` and `setup.py` dependencies. Refer to https://packaging.python.org/requirements/ for an authoritative discussion.	2016-12-12 17:42:46 +01:00