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

One more pass through the recipes, plus work toward the metapackages #19

Merged
merged 37 commits into from
Jul 12, 2018
Merged

One more pass through the recipes, plus work toward the metapackages #19

merged 37 commits into from
Jul 12, 2018

Commits on Jul 10, 2018

  1. Switch to pip for the rest of the installs

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    013edd5 View commit details
    Browse the repository at this point in the history

  2. One more pass through the meta.yaml files

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    d9f0692 View commit details
    Browse the repository at this point in the history

  3. Remove copied-in parts of skare

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    1688d48 View commit details
    Browse the repository at this point in the history

  4. Add ska3-template package

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    a909a71 View commit details
    Browse the repository at this point in the history

  5. Set a list of 'no source' packages in the builder (for now)

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    79d90b8 View commit details
    Browse the repository at this point in the history

  6. Check conda build status from subprocess.run

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    6bb08cf View commit details
    Browse the repository at this point in the history

  7. Add initial versions of ska3-core,dev,pinned meta packages

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    3b58e1c View commit details
    Browse the repository at this point in the history

  8. Update list of no-source pkgs

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    efb3a81 View commit details
    Browse the repository at this point in the history

  9. Comment out sherpa in pinned for now

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    538d18b View commit details
    Browse the repository at this point in the history

  10. Add hopper

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    d34e822 View commit details
    Browse the repository at this point in the history

  11. Add the right path for the cloned sources for cmd_states (which is by… 

    … name not repo name)
    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    09edaa4 View commit details
    Browse the repository at this point in the history

  12. Simplify ska_builder and scripts a bit

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    127ffa6 View commit details
    Browse the repository at this point in the history

  13. Add ska3_builder conda package

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    3bdf16d View commit details
    Browse the repository at this point in the history

  14. Add support for building a single package at a tag/branch/commit

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    23f0f4f View commit details
    Browse the repository at this point in the history

  15. Update build_order

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    5866573 View commit details
    Browse the repository at this point in the history

  16. Fix paths in ska3_builder to get the git repo

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    e9b959b View commit details
    Browse the repository at this point in the history

  17. Remove noarch:python from metapackage

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    a294ac2 View commit details
    Browse the repository at this point in the history

  18. --build-root not --build_root

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    8d92694 View commit details
    Browse the repository at this point in the history

  19. Add core and sherpa as ska3-flight reqs

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    0bc58f4 View commit details
    Browse the repository at this point in the history

  20. Remove conda and conda-env from ska3-flight 

    I'm hoping this helps to make an env that can be installed in non-root

bash-4.1$ conda create -n ska3 ska3-flight
Fetching package metadata .............
Solving package specifications: .

InstallError: Error: the following specs depend on 'conda' and can only be installed
into the root environment: ska3-flight
    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    61303b2 View commit details
    Browse the repository at this point in the history

  21. Add a version for annie and add hopper 0.2 to ska3-flight

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    0aa7cbe View commit details
    Browse the repository at this point in the history

  22. Add ska3-template to ska3-flight

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    fb93385 View commit details
    Browse the repository at this point in the history

  23. Change ska_envs permissions +x and to prefix rewriting in the sh files

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    ba53470 View commit details
    Browse the repository at this point in the history

  24. Remove ska_arch_os holdover

    @jeanconn
    jeanconn committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    5fed743 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2018

  1. Update ska3-dev with ska3-flight packages (unversioned)

    @jeanconn
    jeanconn committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    31c9220 View commit details
    Browse the repository at this point in the history

  2. Added back fetch(--tags) 

    Added back because it seems to help if a tag has been moved/reused.
    @jeanconn
    jeanconn committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    3bd67f8 View commit details
    Browse the repository at this point in the history

  3. Fix typo in recursive include

    @jeanconn
    jeanconn committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    eafc32b View commit details
    Browse the repository at this point in the history

  4. Add pip and other build dependencies to ska3_builder recipe

    @jeanconn
    jeanconn committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    caa6d9e View commit details
    Browse the repository at this point in the history

  5. Update url in ska_conda setup.py

    @jeanconn
    jeanconn committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    1c76773 View commit details
    Browse the repository at this point in the history

  6. Include package data in ska_conda/skare3

    @jeanconn
    jeanconn committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    277f24d View commit details
    Browse the repository at this point in the history

  7. Update help strings in ska3_builder

    @jeanconn
    jeanconn committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    a369ae3 View commit details
    Browse the repository at this point in the history

  8. Fix Clonied typo in print statement

    @jeanconn
    jeanconn committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    056b711 View commit details
    Browse the repository at this point in the history

  9. Add back in SKA_ARCH_OS to flt_envs

    @jeanconn
    jeanconn committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    91944f7 View commit details
    Browse the repository at this point in the history

  10. Throw an error if --tag supplied without package

    @jeanconn
    jeanconn committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    2108d1d View commit details
    Browse the repository at this point in the history

  11. Replace GIT_DESCRIBE_TAG with more template logic 

    This looks more complicated, but helps to guarantee that package
builder cannot build a package that "masquerades" as a certain version
unless the commit from which it was built was exactly at that tagged
version.  For default builds, where the most recent (by commit) tag
is used as the build, this new template logic changes nothing.  However
if one builds a package using ska3_builder with the --tag option at a commit,
the resulting conda package will have at least a 'dev' string in the package
 version unless the selected commit is on a tag.
    @jeanconn
    jeanconn committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    e3ed543 View commit details
    Browse the repository at this point in the history

  12. Add ska3-template to build order

    @jeanconn
    jeanconn committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    f9db2e5 View commit details
    Browse the repository at this point in the history

  13. Revert "Replace GIT_DESCRIBE_TAG with more template logic" 

    This reverts commit e3ed543.
    @jeanconn
    jeanconn committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    8001c50 View commit details
    Browse the repository at this point in the history