Merge pull request #11470 from edx/benp/remove-ruby-deps

[S&B] Remove ruby dependencies.
This commit is contained in:
Ben Patterson
2016-02-09 10:56:21 -05:00
12 changed files with 5 additions and 64 deletions

1
.gitignore vendored
View File

@@ -66,7 +66,6 @@ django-pyfs
.prereqs_cache
.vagrant/
node_modules
.bundle/
bin/
### Static assets pipeline artifacts

View File

@@ -1 +0,0 @@
edx-platform

View File

@@ -1 +0,0 @@
1.9.3-p374

View File

@@ -1,3 +0,0 @@
source 'https://rubygems.org'
gem 'bourbon', '~> 4.0.2'
gem 'neat', '~> 1.6.0'

View File

@@ -1,18 +0,0 @@
GEM
remote: https://rubygems.org/
specs:
bourbon (4.0.2)
sass (~> 3.3)
thor
neat (1.6.0)
bourbon (>= 3.1)
sass (>= 3.3)
sass (3.4.21)
thor (0.19.1)
PLATFORMS
ruby
DEPENDENCIES
bourbon (~> 4.0.2)
neat (~> 1.6.0)

View File

@@ -10,7 +10,6 @@ general:
dependencies:
override:
- npm install
- bundle install
- pip install setuptools
- pip install --exists-action w -r requirements/edx/paver.txt

View File

@@ -132,7 +132,7 @@ SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
################################ PIPELINE #################################
PIPELINE_SASS_ARGUMENTS = '--debug-info --require {proj_dir}/static/sass/bourbon/lib/bourbon.rb'.format(proj_dir=PROJECT_ROOT)
PIPELINE_SASS_ARGUMENTS = '--debug-info'
################################# CELERY ######################################

View File

@@ -229,7 +229,7 @@ FEATURES['RESTRICT_ENROLL_BY_REG_METHOD'] = True
########################### PIPELINE #################################
PIPELINE_SASS_ARGUMENTS = '--debug-info --require {proj_dir}/static/sass/bourbon/lib/bourbon.rb'.format(proj_dir=PROJECT_ROOT)
PIPELINE_SASS_ARGUMENTS = '--debug-info'
########################## ANALYTICS TESTING ########################

View File

@@ -109,7 +109,7 @@ PIPELINE_JS_COMPRESSOR = None
# Whether to run django-require in debug mode.
REQUIRE_DEBUG = DEBUG
PIPELINE_SASS_ARGUMENTS = '--debug-info --require {proj_dir}/static/sass/bourbon/lib/bourbon.rb'.format(proj_dir=PROJECT_ROOT)
PIPELINE_SASS_ARGUMENTS = '--debug-info'
########################### VERIFIED CERTIFICATES #################################

View File

@@ -355,7 +355,6 @@ def watch_assets(options):
@task
@needs(
'pavelib.prereqs.install_ruby_prereqs',
'pavelib.prereqs.install_node_prereqs',
)
@consume_args

View File

@@ -1,5 +1,5 @@
"""
Install Python, Ruby, and Node prerequisites.
Install Python and Node prerequisites.
"""
from distutils import sysconfig
@@ -121,13 +121,6 @@ def prereq_cache(cache_name, paths, install_func):
print '{cache} unchanged, skipping...'.format(cache=cache_name)
def ruby_prereqs_installation():
"""
Installs Ruby prereqs
"""
sh('bundle install --quiet')
def node_prereqs_installation():
"""
Configures npm and installs Node prerequisites
@@ -146,18 +139,6 @@ def python_prereqs_installation():
sh("pip install -q --disable-pip-version-check --exists-action w -r {req_file}".format(req_file=req_file))
@task
def install_ruby_prereqs():
"""
Installs Ruby prereqs
"""
if no_prereq_install():
print NO_PREREQ_MESSAGE
return
prereq_cache("Ruby prereqs", ["Gemfile"], ruby_prereqs_installation)
@task
def install_node_prereqs():
"""
@@ -259,13 +240,12 @@ def install_python_prereqs():
@task
def install_prereqs():
"""
Installs Ruby, Node and Python prerequisites
Installs Node and Python prerequisites
"""
if no_prereq_install():
print NO_PREREQ_MESSAGE
return
install_ruby_prereqs()
install_node_prereqs()
uninstall_python_packages()
install_python_prereqs()

View File

@@ -12,19 +12,6 @@ mongo --quiet --eval 'db.getMongo().getDBNames().forEach(function(i){db.getSibli
# not already be fetched.
git fetch origin master:refs/remotes/origin/master
# Reset the jenkins worker's ruby environment back to
# the state it was in when the instance was spun up.
if [ -e $HOME/edx-rbenv_clean.tar.gz ]; then
rm -rf $HOME/.rbenv
tar -C $HOME -xf $HOME/edx-rbenv_clean.tar.gz
fi
# Bootstrap Ruby requirements so we can run the tests
bundle install
# Ensure the Ruby environment contains no stray gems
bundle clean --force
# Reset the jenkins worker's virtualenv back to the
# state it was in when the instance was spun up.
if [ -e $HOME/edx-venv_clean.tar.gz ]; then