Skip to content

Commit 5d3efed

Browse files
committed
Issue #29 - Add support for bliss-core install from PyPi
- Update README documentation with info on how to specify additional PyPi servers so bliss-core can be installed as part of the GUI installation. The developer install instructions had to be reworked due to issues with pip passing install-option's to dependencies as well as the package to be installed. The current supported work around is a horrible hack. See pypa/pip#1883 for info. - Updated the bliss-core version to the latest release.
1 parent 5302f83 commit 5d3efed

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@ BLISS GUI
33

44
Installation
55
------------
6+
If you would like to install the UI for an end user you can skip all of the frontend dependency installation and install only the pre-bundled application. After cloning the repository, run the following from the project root:
67

7-
`bliss-gui` depends upon `bliss-core` for key functionality. Ensure that you have followed the `bliss-core` installation procedure before progressing to the `bliss-gui` installation. You need to install `bliss-gui` into the same `virtualenv` environment into which you installed `bliss-core`. Be sure to have it activated while following these instructions.
8+
```
9+
pip install . --extra-index-url https://bliss.jpl.nasa.gov/pypi/simple/
10+
```
811

9-
If you would like to install the UI for an end user you can skip all of the frontend dependency installation and install only the pre-bundled application. After cloning the repository, run the following from the project root:
12+
If you plan to do development work on the GUI you should install the repository in `develop` mode and install all of the dependencies necessary for a frontend build.
1013

1114
```
12-
pip install .
15+
pip install -e . --extra-index-url https://bliss.jpl.nasa.gov/pypi/simple && pip install -e . --no-deps --force-reinstall --upgrade --install-option="--with-ui-deps=True"
1316
```
1417

15-
If you plan to do development work on the GUI you should install the repository in `develop` mode and install all of the dependencies necessary for a frontend build.
18+
The above will install `bliss-core` for you. If you wish you can install `bliss-core` manually first and then install just the GUI with the below command. This allows you to have an editable checkout of `bliss-core` available for development.
1619

1720
```
1821
pip install -e . --install-option="--with-ui-deps=True"

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ def run(self):
3737

3838
develop.run(self)
3939

40+
4041
class CustomInstallCmd(install):
4142
user_options = install.user_options + [
4243
('with-ui-deps=', None, "Toggle UI dependency installation")
@@ -69,7 +70,7 @@ def run(self):
6970
include_package_data = True,
7071

7172
scripts = ['./bin/bliss_gui.py'],
72-
install_requires = ['bliss-core>=0.8.0'],
73+
install_requires = ['bliss-core>=0.10.0'],
7374

7475
cmdclass = {
7576
"install": CustomInstallCmd,

0 commit comments

Comments
 (0)