encuentro

Merge lp:~gilgamezh/encuentro/make-it-work-again_venv into lp:encuentro

  1. make-it-work-again_venv
  2. Merge into trunk
Proposed by Nicolás Demarchi
Status: Merged
Merged at revision: 212
Proposed branch: lp:~gilgamezh/encuentro/make-it-work-again_venv
Merge into: lp:encuentro
Diff against target: 46 lines (+4/-5)
4 files modified
LEEME.txt (+2/-2)
bin/encuentro (+1/-1)
encuentro/__init__.py (+1/-1)
requirements.txt (+0/-1)
To merge this branch: bzr merge lp:~gilgamezh/encuentro/make-it-work-again_venv
Reviewer Review Type Date Requested Status
Facundo Batista Pending
Review via email: mp+217537@code.launchpad.net

Description of the change

Little fixes for running under a virtualenv

All test ran OK :D

(encuentro) ✘  ~/code/encuentro/make-it-work-again_venv  ./test
test_example_list_1 (tests.test_bacua_scrapers.ScrapersTestCase) ... ok
test_example_page_1 (tests.test_bacua_scrapers.ScrapersTestCase) ... ok
test_example_page_2 (tests.test_bacua_scrapers.ScrapersTestCase) ... ok
test_example_page_3 (tests.test_bacua_scrapers.ScrapersTestCase) ... ok
test_example_page_4 (tests.test_bacua_scrapers.ScrapersTestCase) ... ok
test_example_series_1 (tests.test_conect_scrapers.ScrapersTestCase) ... ok
test_example_series_2 (tests.test_conect_scrapers.ScrapersTestCase) ... ok
test_example_video_01 (tests.test_conect_scrapers.ScrapersTestCase) ... ok
test_example_programa_1 (tests.test_encuen_scrapers.ScrapersTestCase) ... ok
test_example_programa_2 (tests.test_encuen_scrapers.ScrapersTestCase) ... ok
test_in_the_end_1 (tests.test_helpers.CleanHTMLTestCase) ... ok
test_in_the_end_2 (tests.test_helpers.CleanHTMLTestCase) ... ok
test_remove_tags (tests.test_helpers.CleanHTMLTestCase) ... ok
test_tag_complex (tests.test_helpers.CleanHTMLTestCase) ... ok

----------------------------------------------------------------------
Ran 14 tests in 0.293s

OK
(encuentro) ~/code/encuentro/make-it-work-again_venv 

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'LEEME.txt'
2--- LEEME.txt 2014-03-24 13:56:39 +0000
3+++ LEEME.txt 2014-04-29 01:30:06 +0000
4@@ -55,8 +55,8 @@
5 cualquier otra causa, tenés que seguir los siguientes pasos:
6
7 Es necesario hacer un branch del proyecto, o descargar el tarball,
8-tener python-qt4 instalado y generar el virtualenv con
9-la opción '--system-site-packages'.
10+tener instalado python-qt4 y python-notify. Al generar el virtualenv tenés
11+que utilizar la opción '--system-site-packages'.
12
13 Crear el virtualenv:
14
15
16=== modified file 'bin/encuentro'
17--- bin/encuentro 2014-04-26 02:36:13 +0000
18+++ bin/encuentro 2014-04-29 01:30:06 +0000
19@@ -1,4 +1,4 @@
20-#!/usr/bin/python
21+#!/usr/bin/env python
22
23 # Copyright 2011-2014 Facundo Batista
24 #
25
26=== modified file 'encuentro/__init__.py'
27--- encuentro/__init__.py 2014-03-23 21:10:49 +0000
28+++ encuentro/__init__.py 2014-04-29 01:30:06 +0000
29@@ -1,4 +1,4 @@
30-#!/usr/bin/python
31+#!/usr/bin/env python
32 # -*- coding: utf-8 -*-
33
34 #
35
36=== modified file 'requirements.txt'
37--- requirements.txt 2014-04-28 01:14:07 +0000
38+++ requirements.txt 2014-04-29 01:30:06 +0000
39@@ -1,7 +1,6 @@
40 pyxdg>=0.15
41 requests>=2.2.1
42 defer>=1.0.4
43-py-notify>=0.1.1
44 beautifulsoup4>=4.3.2
45 nose>=1.3.1
46 flake8==2.1.0

Subscribers

People subscribed via source and target branches