Skip to content

Commit

Permalink
Removed submodule stuff for mantid_total_scattering
Browse files Browse the repository at this point in the history
  • Loading branch information
marshallmcdonnell committed Apr 5, 2019
1 parent 75843cc commit 70a39b7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 23 deletions.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,7 @@ addie that way as well. After creating the virtual environment, run
```

which will add a file, `mantid.pth` to your environment with the
location of mantid. Then you need to "develop" mantid_total_scattering

```bash
cd mantid_total_scattering
python setup.py develop
cd -
```

and finally the the normal
location of mantid. Then you need to setup for development:

```bash
python setup.py develop
Expand All @@ -79,6 +71,14 @@ layout python2 -- --system-site-packages
```
so the system wide packages installed for mantid are found.

or with `pipenv` (which will use Pipfile), first setup the directory and then add the `.envrc` file:
```
cd addie
pipenv --two
echo layout_pipenv > .envrc
direnv allow
```

Creating RPMs
-------------

Expand Down
4 changes: 0 additions & 4 deletions addiedevel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ fi
PYTHON_VERSION=$($RAW_PYTHON -c 'import sys; version=sys.version_info[:3]; print("{0}.{1}".format(*version))')
echo using $RAW_PYTHON version $PYTHON_VERSION

# build mantid_total_scattering
cd addie/reduction/mantid_total_scattering
$CMD setup.py build
cd -
# build addie
$CMD setup.py build

Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ doc_files = README.md

[flake8]
ignore = E114,E115,E116,E121,E123,E126,E133,E2,E704,E722,E741,E743,W503,F403,F405,F999
exclude = addie/icons/icons_rc.py,versioneer.py,mantid_total_scattering
exclude = addie/icons/icons_rc.py,versioneer.py
doctests = True
max-line-length = 130

Expand Down
6 changes: 0 additions & 6 deletions update_submodule.sh

This file was deleted.

0 comments on commit 70a39b7

Please sign in to comment.