Skip to content

Commit

Permalink
Remove ruby dependencies.
Browse files Browse the repository at this point in the history
Sass compilation is no longer dependent on Ruby, so we are
removing its dependencies.
  • Loading branch information
Ben Patterson committed Feb 8, 2016
1 parent c51bcdb commit f1b3665
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 61 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ django-pyfs
.prereqs_cache
.vagrant/
node_modules
.bundle/
bin/

### Static assets pipeline artifacts
Expand Down
1 change: 0 additions & 1 deletion .ruby-gemset

This file was deleted.

1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

3 changes: 0 additions & 3 deletions Gemfile

This file was deleted.

18 changes: 0 additions & 18 deletions Gemfile.lock

This file was deleted.

1 change: 0 additions & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ general:
dependencies:
override:
- npm install
- bundle install

- pip install setuptools
- pip install --exists-action w -r requirements/edx/paver.txt
Expand Down
1 change: 0 additions & 1 deletion pavelib/assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,6 @@ def watch_assets(options):

@task
@needs(
'pavelib.prereqs.install_ruby_prereqs',
'pavelib.prereqs.install_node_prereqs',
)
@consume_args
Expand Down
24 changes: 2 additions & 22 deletions pavelib/prereqs.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Install Python, Ruby, and Node prerequisites.
Install Python and Node prerequisites.
"""

from distutils import sysconfig
Expand Down Expand Up @@ -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
Expand All @@ -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():
"""
Expand Down Expand Up @@ -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()
13 changes: 0 additions & 13 deletions scripts/jenkins-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f1b3665

Please sign in to comment.