Skip to content

Commit

Permalink
Merge pull request #753 from RasaHQ/no-e-install
Browse files Browse the repository at this point in the history
remove -e . from requirements
  • Loading branch information
tmbo authored Jan 4, 2018
2 parents be773e3 + 85e5bda commit b0fb6a9
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ install:
- source activate test-environment
- pip install git+https://github.com/tmbo/MITIE.git
- pip install -r alt_requirements/requirements_dev.txt
- pip install -e .
- pip install https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-1.2.0/en_core_web_sm-1.2.0.tar.gz
--no-cache-dir > jnk
- python -m spacy link en_core_web_sm en
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Added

Changed
-------
- removed ``-e .`` from requirements files - if you want to install the app use ``pip install -e .``

Fixed
-----
Expand Down
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,13 @@ From github:
git clone git@github.com:RasaHQ/rasa_nlu.git
cd rasa_nlu
pip install -r requirements.txt
pip install -e .
```

For local development make sure you install the development requirements:
```
pip install -r alt_requirements/requirements_dev.txt
pip install -e .
```

To test the installation use (this will run a very stupid default model. you need to [train your own model](https://rasahq.github.io/rasa_nlu/tutorial.html) to do something useful!):
Expand Down Expand Up @@ -167,12 +169,21 @@ In order to use the Spacy or Mitie backends make sure you have one of their pret
python -m spacy download en
```

To download the Mitie model run and place it in a location that you can
reference in your configuration during model training:
```
wget https://github.com/mit-nlp/MITIE/releases/download/v0.4/MITIE-models-v0.2.tar.bz2
tar jxf MITIE-models-v0.2.tar.bz2
cp MITIE-models/english/total_word_feature_extractor.dat <rasa_nlu_root>/data/
```

If you want to run the tests, you need to copy the model into the Rasa folder:

```
cp MITIE-models/english/total_word_feature_extractor.dat RASA_NLU_ROOT/data/
```

Where `RASA_NLU_ROOT` points to your Rasa installation directory.

# Development Internals

### Steps to release a new version
Expand Down
1 change: 0 additions & 1 deletion alt_requirements/requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ sphinx-autobuild==0.6.0
sphinxcontrib-versioning==2.2.1
nbsphinx==0.2.13
-e git://github.com/RasaHQ/sphinx_rtd_theme.git#egg=sphinx_rtd_theme
-e .
2 changes: 2 additions & 0 deletions docker/Dockerfile_test
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ RUN wget -P data/ https://s3-eu-west-1.amazonaws.com/mitie/total_word_feature_e

RUN pip install -r alt_requirements/requirements_dev.txt

RUN pip install -e .

RUN sed -i -e 's/backend : tkagg/backend : PDF/' /usr/local/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc

VOLUME ["/app/projects", "/app/logs", "/app/data"]
Expand Down
4 changes: 2 additions & 2 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ If you want to use the bleeding edge version use github + setup.py:
git clone https://github.com/RasaHQ/rasa_nlu.git
cd rasa_nlu
pip install -r requirements.txt
python setup.py install
pip install -e .
rasa NLU allows you to use components to process your messages. E.g. there is a component for intent classification and
there are several different components for entity recognition. The different components
Expand All @@ -38,7 +38,7 @@ installed and tell you which are missing, if any.
pip install -r alt_requirements/requirements_full.txt
to install all requirements.
instead of ``requirements.txt`` to install all requirements.

Setting up a backend
~~~~~~~~~~~~~~~~~~~~
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e .
-r alt_requirements/requirements_bare.txt

0 comments on commit b0fb6a9

Please sign in to comment.