Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-pipeline
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
django-pipeline
Commits
bb9cfdc6
Commit
bb9cfdc6
authored
Dec 16, 2011
by
Timothée Peignier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove mention of PIPELINE_URL
parent
440f9adb
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 additions
and
18 deletions
+1
-18
pipeline/compressors/__init__.py
+1
-2
pipeline/conf/settings.py
+0
-5
tests/settings.py
+0
-1
tests/tests/compressor.py
+0
-3
tests/tests/packager.py
+0
-7
No files found.
pipeline/compressors/__init__.py
View file @
bb9cfdc6
...
...
@@ -148,8 +148,7 @@ class Compressor(object):
return
asset_path
if
not
os
.
path
.
isabs
(
asset_path
):
asset_path
=
self
.
relative_path
(
public_path
)
asset_url
=
asset_path
.
replace
(
os
.
sep
,
'/'
)
return
settings
.
PIPELINE_URL
+
asset_url
[
1
:]
return
asset_path
[
1
:]
def
embeddable
(
self
,
path
,
variant
):
"""Is the asset embeddable ?"""
...
...
pipeline/conf/settings.py
View file @
bb9cfdc6
...
...
@@ -4,7 +4,6 @@ from django.core.exceptions import ImproperlyConfigured
PIPELINE
=
getattr
(
settings
,
'PIPELINE'
,
not
settings
.
DEBUG
)
PIPELINE_ROOT
=
getattr
(
settings
,
'PIPELINE_ROOT'
,
settings
.
STATIC_ROOT
)
PIPELINE_URL
=
getattr
(
settings
,
'PIPELINE_URL'
,
settings
.
STATIC_URL
)
PIPELINE_STORAGE
=
getattr
(
settings
,
'PIPELINE_STORAGE'
,
'pipeline.storage.PipelineFinderStorage'
)
...
...
@@ -51,7 +50,3 @@ PIPELINE_LESS_ARGUMENTS = getattr(settings, 'PIPELINE_LESS_ARGUMENTS', '')
if
PIPELINE_COMPILERS
is
None
:
PIPELINE_COMPILERS
=
[]
if
not
PIPELINE_URL
:
raise
ImproperlyConfigured
(
"You're using the pipeline app "
"without having set the required STATIC_URL setting."
)
tests/settings.py
View file @
bb9cfdc6
...
...
@@ -36,7 +36,6 @@ STATICFILES_FINDERS = (
)
PIPELINE_ROOT
=
local_path
(
'assets/'
)
PIPELINE_URL
=
STATIC_URL
PIPELINE_TEMPLATE_EXT
=
".jst"
TEMPLATE_DIRS
=
(
...
...
tests/tests/compressor.py
View file @
bb9cfdc6
...
...
@@ -13,9 +13,7 @@ from pipeline.compressors.yui import YUICompressor
class
CompressorTest
(
TestCase
):
def
setUp
(
self
):
self
.
compressor
=
Compressor
()
self
.
old_pipeline_url
=
settings
.
PIPELINE_URL
self
.
old_pipeline_root
=
settings
.
PIPELINE_ROOT
settings
.
PIPELINE_URL
=
'http://localhost/static/'
def
test_js_compressor_class
(
self
):
self
.
assertEquals
(
self
.
compressor
.
js_compressor
,
YUICompressor
)
...
...
@@ -131,5 +129,4 @@ class CompressorTest(TestCase):
}"""
,
output
)
def
tearDown
(
self
):
settings
.
PIPELINE_URL
=
self
.
old_pipeline_url
settings
.
PIPELINE_ROOT
=
self
.
old_pipeline_root
tests/tests/packager.py
View file @
bb9cfdc6
...
...
@@ -7,10 +7,6 @@ from pipeline.packager import Packager, PackageNotFound
class
PackagerTest
(
TestCase
):
def
setUp
(
self
):
self
.
old_pipeline_url
=
settings
.
PIPELINE_URL
settings
.
PIPELINE_URL
=
'http://localhost/static/'
def
test_package_for
(
self
):
packager
=
Packager
()
packager
.
packages
[
'js'
]
=
packager
.
create_packages
({
...
...
@@ -69,6 +65,3 @@ class PackagerTest(TestCase):
individual_url
=
packager
.
individual_url
(
filename
)
self
.
assertEqual
(
individual_url
,
"http://localhost/static/js/application.js"
)
def
tearDown
(
self
):
settings
.
PIPELINE_URL
=
self
.
old_pipeline_url
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment