From f1b366589b67fa507592f875e9b225de55b149b4 Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Mon, 8 Feb 2016 17:00:51 -0500 Subject: [PATCH 1/2] Remove ruby dependencies. Sass compilation is no longer dependent on Ruby, so we are removing its dependencies. --- .gitignore | 1 - .ruby-gemset | 1 - .ruby-version | 1 - Gemfile | 3 --- Gemfile.lock | 18 ------------------ circle.yml | 1 - pavelib/assets.py | 1 - pavelib/prereqs.py | 24 ++---------------------- scripts/jenkins-common.sh | 13 ------------- 9 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 .ruby-gemset delete mode 100644 .ruby-version delete mode 100644 Gemfile delete mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index ecb4236cd4..89313581c5 100644 --- a/.gitignore +++ b/.gitignore @@ -66,7 +66,6 @@ django-pyfs .prereqs_cache .vagrant/ node_modules -.bundle/ bin/ ### Static assets pipeline artifacts diff --git a/.ruby-gemset b/.ruby-gemset deleted file mode 100644 index 77266c35f0..0000000000 --- a/.ruby-gemset +++ /dev/null @@ -1 +0,0 @@ -edx-platform diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index 311baaf3e2..0000000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -1.9.3-p374 diff --git a/Gemfile b/Gemfile deleted file mode 100644 index b438bc89e3..0000000000 --- a/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source 'https://rubygems.org' -gem 'bourbon', '~> 4.0.2' -gem 'neat', '~> 1.6.0' diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index fb1a1e69f7..0000000000 --- a/Gemfile.lock +++ /dev/null @@ -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) diff --git a/circle.yml b/circle.yml index 1c0903b615..212f0a7bdb 100644 --- a/circle.yml +++ b/circle.yml @@ -10,7 +10,6 @@ general: dependencies: override: - npm install - - bundle install - pip install setuptools - pip install --exists-action w -r requirements/edx/paver.txt diff --git a/pavelib/assets.py b/pavelib/assets.py index d7c8c13c0d..26478f1dac 100644 --- a/pavelib/assets.py +++ b/pavelib/assets.py @@ -355,7 +355,6 @@ def watch_assets(options): @task @needs( - 'pavelib.prereqs.install_ruby_prereqs', 'pavelib.prereqs.install_node_prereqs', ) @consume_args diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py index 1136865381..7e8828027b 100644 --- a/pavelib/prereqs.py +++ b/pavelib/prereqs.py @@ -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() diff --git a/scripts/jenkins-common.sh b/scripts/jenkins-common.sh index fb52f5a1c5..82cba87b00 100644 --- a/scripts/jenkins-common.sh +++ b/scripts/jenkins-common.sh @@ -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 From ffa089a9c6e3cbe7da740babc18507b14b325196 Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Mon, 8 Feb 2016 18:18:29 -0500 Subject: [PATCH 2/2] Remove ruby reference in pipeline arguments. --- cms/envs/dev.py | 2 +- lms/envs/dev.py | 2 +- lms/envs/devstack.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cms/envs/dev.py b/cms/envs/dev.py index 8320a7b439..c72d5c2d41 100644 --- a/cms/envs/dev.py +++ b/cms/envs/dev.py @@ -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 ###################################### diff --git a/lms/envs/dev.py b/lms/envs/dev.py index 1be98fe037..065ed74b28 100644 --- a/lms/envs/dev.py +++ b/lms/envs/dev.py @@ -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 ######################## diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py index a0ff8932ce..e8ef6cd0a5 100644 --- a/lms/envs/devstack.py +++ b/lms/envs/devstack.py @@ -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 #################################