Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge build #2035

Merged
merged 23 commits into from
Dec 5, 2019
Merged

Merge build #2035

merged 23 commits into from
Dec 5, 2019

Conversation

joshmoore
Copy link
Member

@joshmoore joshmoore commented Nov 26, 2019 •
edited

Script for building a snapshot of the OMERO documentation in devspace rather than ci-master. This should merge upstream dependencies like omero-install and omeroweb-install, then run autogen, and finally build sphinx.

see:

@joshmoore joshmoore changed the title Merge build Merge build (WIP) Nov 26, 2019
@joshmoore joshmoore force-pushed the merge-build branch 2 times, most recently from 27e606f to c857f42 Compare November 26, 2019 12:21
@joshmoore joshmoore mentioned this pull request Nov 26, 2019
Merged
@joshmoore
Copy link
Member Author

State at this point is passing locally with the following test.sh:

export WORKSPACE=$PWD
export OMERO_RELEASE=5.6.0-m2
/opt/docs0/autogen_omero.sh

run from a WORKSPACE directory of the form:

(py36) /tmp/ws $ls -l
total 8
lrwxr-xr-x  1 jamoore  wheel   15 Nov 26 13:33 OMERO.server -> /opt/ome9/dist/
lrwxr-xr-x  1 jamoore  wheel   10 Nov 26 13:36 ome-documentation -> /opt/docs0
lrwxr-xr-x  1 jamoore  wheel   19 Nov 26 13:34 omero-install -> /opt/omero-install/
lrwxr-xr-x  1 jamoore  wheel   21 Nov 26 13:34 omeroweb-install -> /opt/omeroweb-install
-rwxr-xr-x  1 jamoore  wheel   80 Nov 26 16:19 test.sh
drwxr-xr-x  5 jamoore  wheel  160 Nov 26 13:36 venv

@joshmoore joshmoore added this to In progress in OMERO.server 5.6.0 (Python 3) via automation Nov 26, 2019
@snoopycrimecop snoopycrimecop mentioned this pull request Nov 27, 2019
Merged
@joshmoore joshmoore changed the title Merge build (WIP) Merge build Nov 29, 2019
@joshmoore joshmoore mentioned this pull request Nov 29, 2019
Merged
jburel
jburel reviewed Dec 5, 2019
View reviewed changes
autogen_omero.sh
rm -rf $WORKSPACE/venv
fi
python3 -m venv --system-site-packages $WORKSPACE/venv || virtualenv --system-site-packages $WORKSPACE/venv
$WORKSPACE/venv/bin/pip install -r $WORKSPACE/OMERO.server/share/web/requirements-py27.txt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$WORKSPACE/venv/bin/pip install -r $WORKSPACE/OMERO.server/share/web/requirements-py27.txt seems strange with the decoupled work

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. Happy to replace it, but requires something upstream.
see ome/omero-web#96

omero/autogen_db_version.py Outdated Show resolved Hide resolved
omero/autogen_docs
omero config set omero.web.application_server wsgi-tcp
omero web config nginx | sed "s|$WORKSPACE/OMERO.server|/home/omero/OMERO.py|g" > omero/sysadmins/unix/install-web/nginx-omero.conf
omero web config nginx-location | sed "s|$WORKSPACE/OMERO.server|/home/omero/OMERO.py|g" | grep -v '^#' > omero/sysadmins/unix/install-web/nginx-location.conf
omero web config nginx-location | sed "s|/opt/omero/web|/home/omero|g" | grep '^##' | cut -c3-
Copy link
Member

@jburel jburel Dec 5, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self. This will have to be reviewed when we rename omero ->omero-web/omero-server

@joshmoore joshmoore mentioned this pull request Dec 5, 2019
Closed
@joshmoore
Copy link
Member Author

@jburel : travis is green again. Any objections?

@jburel
Copy link
Member

jburel commented Dec 5, 2019 •
edited

No. merging

@jburel jburel merged commit d9e07be into ome:develop Dec 5, 2019
OMERO.server 5.6.0 (Python 3) automation moved this from In progress to Done Dec 5, 2019
@joshmoore joshmoore deleted the merge-build branch December 5, 2019 11:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jburel jburel jburel left review comments

Assignees
No one assigned
Labels
None yet
Projects
No open projects
OMERO.server 5.6.0 (Python 3)
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@joshmoore @jburel