diff --git a/.travis.yml b/.travis.yml index 06ec320..9827095 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ env: - DJANGO: django>=1.8,<1.9 - DJANGO: django>=1.9,<1.10 - DJANGO: django>=1.10,<1.11 + - DJANGO: django>=1.11,<1.12 before_install: - pip install codecov diff --git a/docs/api.rst b/docs/api.rst index c1ccb65..ecc9105 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -123,6 +123,6 @@ A sample Python 2 script to publish snippets:: You can simply use curl to publish a whole file:: - $ alias dpaste="curl -F 'content=<-' https://dpaste.de/api/?format=url" + $ alias dpaste="curl -F 'format=url' -F 'content=<-' https://dpaste.de/api/" $ cat foo.txt | dpaste https://dpaste.de/ke2pB diff --git a/docs/installation.rst b/docs/installation.rst index 5e0e513..9e402b7 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -15,11 +15,15 @@ Ready to contribute? Here's how to set up `dpaste` for local development. $ cd dpaste/ $ pip install -r requirements.txt -4. Run the commands:: +4. Copy the settings file and edit it, to meet your needs:: + + $ cp dpaste/settings/local.py.example dpaste/settings/local.py + $ nano dpaste/settings/local.py + +5. Initialze the database by running the command:: - $ python manage.py syncdb $ python manage.py migrate -5. Start up the webserver:: +6. Start up the webserver:: $ python manage.py runserver diff --git a/dpaste/templates/dpaste/about.html b/dpaste/templates/dpaste/about.html index aee113d..e527a22 100644 --- a/dpaste/templates/dpaste/about.html +++ b/dpaste/templates/dpaste/about.html @@ -37,14 +37,14 @@ on this page. For a quick start here is a code example (Python 2.x):

{# Just put the script in dpaste and copy the source node #} -
  1. #!/usr/bin/env python
  2.  
  3. from urllib import urlencode
  4. from urllib2 import Request, urlopen
  5. from sys import stdin
  6.  
  7. def paste_code():
  8.     request = Request('https://dpaste.de/api/', urlencode({
  9.         'content': stdin.read(),
  10.         'lexer': 'python',
  11.         'format': 'url',
  12.     }))
  13.     print urlopen(request).read()
  14.  
  15. if __name__ == '__main__':
  16.     paste_code()
+
  1. #!/usr/bin/env python
  2.  
  3. from urllib import urlencode
  4. from urllib2 import Request, urlopen
  5. from sys import stdin
  6.  
  7. def paste_code():
  8.     request = Request('{{ site_url }}/api/', urlencode({
  9.         'content': stdin.read(),
  10.         'lexer': 'python',
  11.         'format': 'url',
  12.     }))
  13.     print urlopen(request).read()
  14.  
  15. if __name__ == '__main__':
  16.     paste_code()

Save this script in /usr/local/bin/dpaste and give it the executable bit: chmod +x /usr/local/bin/dpaste.

Usage: cat foo.txt | dpaste

An alternative would be to just use curl: - alias dpaste="curl -F 'content=<-' https://dpaste.de/api/"

+ alias dpaste="curl -F 'content=<-' {{ site_url }}/api/"

Applications using the API:

@@ -84,7 +84,7 @@

Type the 4 letter code of your snippet in the field and submit. - Like this yellow one here: http://dpaste.de/SiZrT + Like this yellow one here: {{ site_url }}/SiZrT

diff --git a/setup.py b/setup.py index 3d79561..0ff54af 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ long_description = u'\n\n'.join(( setup( name='dpaste', - version='2.13', + version='3.0a', description='dpaste is a Django based pastebin. It\'s intended to run ' 'separately but its also possible to be installed into an ' 'existing Django project like a regular app.', diff --git a/tox.ini b/tox.ini index 232ada2..5350d2e 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ toxworkdir=/tmp/tox/dpaste skip_missing_interpreters=True envlist= - py{27,34,35,36}-django-{18,19,110} + py{27,34,35,36}-django-{18,19,110,111} [testenv] install_command = @@ -16,3 +16,4 @@ deps= django-18: django>=1.8,<1.9 django-19: django>=1.9,<1.10 django-110: django>=1.10,<1.11 + django-111: django>=1.11,<1.12