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.

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

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

Merged
merged 37 commits into from
Jul 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
013edd5
Switch to pip for the rest of the installs
jeanconn Jul 10, 2018
d9f0692
One more pass through the meta.yaml files
jeanconn Jul 10, 2018
1688d48
Remove copied-in parts of skare
jeanconn Jul 10, 2018
a909a71
Add ska3-template package
jeanconn Jul 10, 2018
79d90b8
Set a list of 'no source' packages in the builder (for now)
jeanconn Jul 10, 2018
6bb08cf
Check conda build status from subprocess.run
jeanconn Jul 10, 2018
3b58e1c
Add initial versions of ska3-core,dev,pinned meta packages
jeanconn Jul 10, 2018
efb3a81
Update list of no-source pkgs
jeanconn Jul 10, 2018
538d18b
Comment out sherpa in pinned for now
jeanconn Jul 10, 2018
d34e822
Add hopper
jeanconn Jul 10, 2018
09edaa4
Add the right path for the cloned sources for cmd_states (which is by…
jeanconn Jul 10, 2018
127ffa6
Simplify ska_builder and scripts a bit
jeanconn Jul 10, 2018
3bdf16d
Add ska3_builder conda package
jeanconn Jul 10, 2018
23f0f4f
Add support for building a single package at a tag/branch/commit
jeanconn Jul 10, 2018
5866573
Update build_order
jeanconn Jul 10, 2018
e9b959b
Fix paths in ska3_builder to get the git repo
jeanconn Jul 10, 2018
a294ac2
Remove noarch:python from metapackage
jeanconn Jul 10, 2018
8d92694
--build-root not --build_root
jeanconn Jul 10, 2018
0bc58f4
Add core and sherpa as ska3-flight reqs
jeanconn Jul 10, 2018
61303b2
Remove conda and conda-env from ska3-flight
jeanconn Jul 10, 2018
0aa7cbe
Add a version for annie and add hopper 0.2 to ska3-flight
jeanconn Jul 10, 2018
fb93385
Add ska3-template to ska3-flight
jeanconn Jul 10, 2018
ba53470
Change ska_envs permissions +x and to prefix rewriting in the sh files
jeanconn Jul 10, 2018
5fed743
Remove ska_arch_os holdover
jeanconn Jul 10, 2018
31c9220
Update ska3-dev with ska3-flight packages (unversioned)
jeanconn Jul 11, 2018
3bd67f8
Added back fetch(--tags)
jeanconn Jul 11, 2018
eafc32b
Fix typo in recursive include
jeanconn Jul 11, 2018
caa6d9e
Add pip and other build dependencies to ska3_builder recipe
jeanconn Jul 11, 2018
1c76773
Update url in ska_conda setup.py
jeanconn Jul 11, 2018
277f24d
Include package data in ska_conda/skare3
jeanconn Jul 11, 2018
a369ae3
Update help strings in ska3_builder
jeanconn Jul 11, 2018
056b711
Fix Clonied typo in print statement
jeanconn Jul 11, 2018
91944f7
Add back in SKA_ARCH_OS to flt_envs
jeanconn Jul 11, 2018
2108d1d
Throw an error if --tag supplied without package
jeanconn Jul 11, 2018
e3ed543
Replace GIT_DESCRIBE_TAG with more template logic
jeanconn Jul 11, 2018
f9db2e5
Add ska3-template to build order
jeanconn Jul 11, 2018
8001c50
Revert "Replace GIT_DESCRIBE_TAG with more template logic"
jeanconn Jul 11, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include ska_conda/pkg_spec/*
include ska_conda/build_order.txt
recursive-include ska_conda/pkg_defs *
include ska_conda/build_order.txt
124 changes: 0 additions & 124 deletions Makefile.in

This file was deleted.

22 changes: 0 additions & 22 deletions cfg/anaconda-64.cfg

This file was deleted.

14 changes: 0 additions & 14 deletions cfg/template.cfg

This file was deleted.

Loading