Commit f12c415e by Ben Patterson

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

[S&B] Remove ruby dependencies.
parents a5e34d4e ffa089a9
...@@ -66,7 +66,6 @@ django-pyfs ...@@ -66,7 +66,6 @@ django-pyfs
.prereqs_cache .prereqs_cache
.vagrant/ .vagrant/
node_modules node_modules
.bundle/
bin/ bin/
### Static assets pipeline artifacts ### Static assets pipeline artifacts
......
source 'https://rubygems.org'
gem 'bourbon', '~> 4.0.2'
gem 'neat', '~> 1.6.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)
...@@ -10,7 +10,6 @@ general: ...@@ -10,7 +10,6 @@ general:
dependencies: dependencies:
override: override:
- npm install - npm install
- bundle install
- pip install setuptools - pip install setuptools
- pip install --exists-action w -r requirements/edx/paver.txt - pip install --exists-action w -r requirements/edx/paver.txt
......
...@@ -132,7 +132,7 @@ SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd' ...@@ -132,7 +132,7 @@ SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
################################ PIPELINE ################################# ################################ 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 ###################################### ################################# CELERY ######################################
......
...@@ -229,7 +229,7 @@ FEATURES['RESTRICT_ENROLL_BY_REG_METHOD'] = True ...@@ -229,7 +229,7 @@ FEATURES['RESTRICT_ENROLL_BY_REG_METHOD'] = True
########################### PIPELINE ################################# ########################### 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 ######################## ########################## ANALYTICS TESTING ########################
......
...@@ -109,7 +109,7 @@ PIPELINE_JS_COMPRESSOR = None ...@@ -109,7 +109,7 @@ PIPELINE_JS_COMPRESSOR = None
# Whether to run django-require in debug mode. # Whether to run django-require in debug mode.
REQUIRE_DEBUG = DEBUG 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 ################################# ########################### VERIFIED CERTIFICATES #################################
......
...@@ -355,7 +355,6 @@ def watch_assets(options): ...@@ -355,7 +355,6 @@ def watch_assets(options):
@task @task
@needs( @needs(
'pavelib.prereqs.install_ruby_prereqs',
'pavelib.prereqs.install_node_prereqs', 'pavelib.prereqs.install_node_prereqs',
) )
@consume_args @consume_args
......
""" """
Install Python, Ruby, and Node prerequisites. Install Python and Node prerequisites.
""" """
from distutils import sysconfig from distutils import sysconfig
...@@ -121,13 +121,6 @@ def prereq_cache(cache_name, paths, install_func): ...@@ -121,13 +121,6 @@ def prereq_cache(cache_name, paths, install_func):
print '{cache} unchanged, skipping...'.format(cache=cache_name) print '{cache} unchanged, skipping...'.format(cache=cache_name)
def ruby_prereqs_installation():
"""
Installs Ruby prereqs
"""
sh('bundle install --quiet')
def node_prereqs_installation(): def node_prereqs_installation():
""" """
Configures npm and installs Node prerequisites Configures npm and installs Node prerequisites
...@@ -147,18 +140,6 @@ def python_prereqs_installation(): ...@@ -147,18 +140,6 @@ def python_prereqs_installation():
@task @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(): def install_node_prereqs():
""" """
Installs Node prerequisites Installs Node prerequisites
...@@ -259,13 +240,12 @@ def install_python_prereqs(): ...@@ -259,13 +240,12 @@ def install_python_prereqs():
@task @task
def install_prereqs(): def install_prereqs():
""" """
Installs Ruby, Node and Python prerequisites Installs Node and Python prerequisites
""" """
if no_prereq_install(): if no_prereq_install():
print NO_PREREQ_MESSAGE print NO_PREREQ_MESSAGE
return return
install_ruby_prereqs()
install_node_prereqs() install_node_prereqs()
uninstall_python_packages() uninstall_python_packages()
install_python_prereqs() install_python_prereqs()
...@@ -12,19 +12,6 @@ mongo --quiet --eval 'db.getMongo().getDBNames().forEach(function(i){db.getSibli ...@@ -12,19 +12,6 @@ mongo --quiet --eval 'db.getMongo().getDBNames().forEach(function(i){db.getSibli
# not already be fetched. # not already be fetched.
git fetch origin master:refs/remotes/origin/master 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 # Reset the jenkins worker's virtualenv back to the
# state it was in when the instance was spun up. # state it was in when the instance was spun up.
if [ -e $HOME/edx-venv_clean.tar.gz ]; then if [ -e $HOME/edx-venv_clean.tar.gz ]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment