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
+101 −13

Commits on Nov 26, 2019

  1. Copy from jenkins

    @joshmoore
    joshmoore committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    5270470 View commit details
    Browse the repository at this point in the history

  2. Updates for running locally

    @joshmoore
    joshmoore committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    6bf2512 View commit details
    Browse the repository at this point in the history

  3. Rely on pip-installed omero

    @joshmoore
    joshmoore committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    493ac61 View commit details
    Browse the repository at this point in the history

  4. workspace fixes

    @joshmoore
    joshmoore committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    bd2721e View commit details
    Browse the repository at this point in the history

  5. Simplify script for artifacts rather than release

    @joshmoore
    joshmoore committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    2226797 View commit details
    Browse the repository at this point in the history

  6. Download OMERO.server in Jenkinsfile

    @joshmoore
    joshmoore committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    cd4a836 View commit details
    Browse the repository at this point in the history

  7. Activate phase 1 OMERO.server

    @joshmoore
    joshmoore committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    ca434ea View commit details
    Browse the repository at this point in the history

  8. Create a virtualenv

    @joshmoore
    joshmoore committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    9869602 View commit details
    Browse the repository at this point in the history

  9. Correct starting location of scripts

    @joshmoore
    joshmoore committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    ee959e6 View commit details
    Browse the repository at this point in the history

  10. Futurize and add new pypi versions

    @joshmoore
    joshmoore committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    d606ebb View commit details
    Browse the repository at this point in the history

  11. Fix web development issue

    @joshmoore
    joshmoore committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    19f1f9a View commit details
    Browse the repository at this point in the history

  12. Merge branch 'develop' into merge-build

    @joshmoore
    joshmoore committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    7a47dc2 View commit details
    Browse the repository at this point in the history

  13. Temporarily pre-run for logging purposes

    @joshmoore
    joshmoore committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    5bbe2b5 View commit details
    Browse the repository at this point in the history

  14. Install future in venv

    @joshmoore
    joshmoore committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    8901081 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2019

  1. Always recreate venv, preferring py3

    @joshmoore
    joshmoore committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    11c2b98 View commit details
    Browse the repository at this point in the history

  2. Install ansible

    @joshmoore
    joshmoore committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    3e350e7 View commit details
    Browse the repository at this point in the history

  3. Remove osx for omeroweb-install

    @joshmoore
    joshmoore committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    f8407fb View commit details
    Browse the repository at this point in the history

  4. Set PYTHONPATH

    @joshmoore
    joshmoore committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    441d96c View commit details
    Browse the repository at this point in the history

  5. Install scc

    @joshmoore
    joshmoore committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    28ef1e0 View commit details
    Browse the repository at this point in the history

  6. Temporarily pin pyyaml to 5.1

    @joshmoore
    joshmoore committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    03184a1 View commit details
    Browse the repository at this point in the history

  7. Replace make with ant

    @joshmoore
    joshmoore committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    2d44f5c View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2019

  1. Include pip-local just in case

    @joshmoore
    joshmoore committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    5daa8aa View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2019

  1. Add newline at end of file

    @joshmoore
    joshmoore committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    5b46c95 View commit details
    Browse the repository at this point in the history