diff --git a/ska_conda/pkg_defs/ska3-core/combine_arch.py b/ska_conda/pkg_defs/ska3-core/combine_arch.py new file mode 100644 index 00000000..0d38d2fa --- /dev/null +++ b/ska_conda/pkg_defs/ska3-core/combine_arch.py @@ -0,0 +1,43 @@ +import json +import argparse +import numpy as np +from distutils.version import LooseVersion + +parser = argparse.ArgumentParser(description="Make a combined arch-specific core package list") +parser.add_argument("--linux", + help="conda list json file with list of linux packages") +parser.add_argument("--osx", + help="conda list json file with list of osx packages") +parser.add_argument("--out", + help="filename for output file with combined list of files" + " for use in metapackage ") +args = parser.parse_args() + + +def core_pkgs(pkgs): + # This defines the "core" packages as everything that came from defaults + # channel except the conda (conda, conda-build, conda-env, etc) packages + core = {p['name']:p['version'] for p in pkgs if ((p['channel'] == 'defaults') + & (not p['name'].startswith('conda')))} + return core + +pkgs = {'linux': core_pkgs(json.load(open(args.linux))), + 'osx': core_pkgs(json.load(open(args.osx)))} + +full = np.unique(list(pkgs['linux']) + list(pkgs['osx'])) + +pkglist = [] +for p in full: + # For packages that are automatically installed (by dependency request) on both + # OSes, here we've just selected the minimum version to require. The actual set of + # packages still needs to be tested after creation. + if p in pkgs['linux'] and p in pkgs['osx']: + versions = [pkgs['linux'][p], pkgs['osx'][p]] + versions.sort(key=LooseVersion) + pkglist.append(" - {} =={}".format(p, versions[0])) + if p in pkgs['linux'] and p not in pkgs['osx']: + pkglist.append(" - {} =={} [linux]".format(p, pkgs['linux'][p])) + if p in pkgs['osx'] and p not in pkgs['linux']: + pkglist.append(" - {} =={} [osx]".format(p, pkgs['osx'][p])) + +open(args.out, 'w').write("\n".join(pkglist)) diff --git a/ska_conda/pkg_defs/ska3-core/meta.yaml b/ska_conda/pkg_defs/ska3-core/meta.yaml index fada7593..9ad150d2 100644 --- a/ska_conda/pkg_defs/ska3-core/meta.yaml +++ b/ska_conda/pkg_defs/ska3-core/meta.yaml @@ -1,47 +1,51 @@ package: name: ska3-core - version: 2018.07.16 - -build: - noarch: generic + version: 2018.07.26 requirements: # Packages required to run the package. These are the dependencies that # will be installed automatically whenever the package is installed. run: + - _nb_ext_conf ==0.4.0 - alabaster ==0.7.10 + - anaconda-client ==1.6.3 + - appnope ==0.1.0 [osx] - asn1crypto ==0.22.0 - astroid ==1.5.3 - astropy ==2.0.1 - babel ==2.5.0 - beautifulsoup4 ==4.6.0 + - bkcharts ==0.2 - bleach ==1.5.0 + - bokeh ==0.12.7 - certifi ==2016.2.28 - - cffi ==1.9.1 + - cffi ==1.10.0 - chardet ==3.0.4 + - clyent ==1.2.2 - configobj ==5.0.6 - cryptography ==1.8.1 - curl ==7.54.1 - cycler ==0.10.0 - cython ==0.26 - - db ==5.3.28 - - dbus ==1.10.20 + - dbus ==1.10.20 [linux] - decorator ==4.1.2 - django ==1.11.3 - docutils ==0.14 - entrypoints ==0.2.3 - expat ==2.1.0 - - fontconfig ==2.12.1 + - fontconfig ==2.12.1 [linux] - freetype ==2.5.5 - git ==2.11.1 - - glib ==2.50.2 - - gst-plugins-base ==1.8.0 - - gstreamer ==1.8.0 + - gitdb2 ==2.0.0 + - gitpython ==2.1.3 + - glib ==2.50.2 [linux] + - gst-plugins-base ==1.8.0 [linux] + - gstreamer ==1.8.0 [linux] - h5py ==2.7.0 - hdf5 ==1.8.17 - - html5lib ==0.9999999 + - html5lib ==0.999 - icu ==54.1 - - idna ==2.2 + - idna ==2.6 - imagesize ==0.7.1 - ipykernel ==4.6.1 - ipyparallel ==6.0.2 @@ -60,28 +64,28 @@ requirements: - jupyter_core ==4.3.0 - krb5 ==1.13.2 - lazy-object-proxy ==1.3.1 - - libffi ==3.2.1 + - libffi ==3.2.1 [linux] - libgcc ==4.8.5 - libgfortran ==3.0.0 - - libiconv ==1.14 + - libiconv ==1.14 [linux] - libpng ==1.6.30 - - libsodium ==1.0.10 + - libsodium ==1.0.10 [linux] - libssh2 ==1.8.0 - libtiff ==4.0.6 - - libxcb ==1.12 - - libxml2 ==2.9.4 - - libxslt ==1.1.29 + - libxcb ==1.12 [linux] + - libxml2 ==2.9.4 [linux] - line_profiler ==2.0 - llvmlite ==0.18.0 - - lxml ==3.8.0 - markupsafe ==1.0 - matplotlib ==2.0.2 - mistune ==0.7.4 - mkl ==2017.0.3 - - mpi4py ==2.0.0 - - mpich2 ==1.4.1p1 + - nb_anacondacloud ==1.4.0 + - nb_conda ==2.2.0 + - nb_conda_kernels ==2.1.0 - nbconvert ==5.2.1 - nbformat ==4.4.0 + - nbpresent ==3.0.2 - networkx ==1.11 - nose ==1.3.7 - notebook ==5.0.0 @@ -96,32 +100,30 @@ requirements: - pandocfilters ==1.4.2 - paramiko ==2.1.2 - path.py ==10.3.1 - - pcre ==8.39 + - pcre ==8.39 [linux] - pep8 ==1.7.0 - pexpect ==4.2.1 - pickleshare ==0.7.4 - pillow ==4.2.1 - pip ==9.0.1 - - ply ==3.10 - prompt_toolkit ==1.0.15 - psutil ==5.2.2 - ptyprocess ==0.5.2 - py ==1.4.34 - - pyasn1 ==0.1.9 + - pyasn1 ==0.2.3 - pycodestyle ==2.3.1 - - pycosat ==0.6.1 - - pycparser ==2.17 + - pycparser ==2.18 - pycrypto ==2.6.1 - pyflakes ==1.6.0 - pygments ==2.2.0 - pylint ==1.7.2 - - pyopenssl ==16.2.0 - pyparsing ==2.2.0 - pyqt ==5.6.0 - pytables ==3.4.2 - pytest ==3.2.1 - python ==3.6.2 - python-dateutil ==2.6.1 + - python.app ==1.2 [osx] - pytz ==2017.2 - pyyaml ==3.12 - pyzmq ==16.0.2 @@ -132,7 +134,6 @@ requirements: - readline ==6.2 - requests ==2.14.2 - rope ==0.9.4 - - ruamel_yaml ==0.11.14 - runipy ==0.1.5 - scikit-learn ==0.19.0 - scipy ==0.19.1 @@ -141,12 +142,12 @@ requirements: - singledispatch ==3.4.0.3 - sip ==4.18 - six ==1.10.0 + - smmap2 ==2.0.1 - snowballstemmer ==1.2.1 - sphinx ==1.6.3 - sphinxcontrib ==1.0 - sphinxcontrib-websupport ==1.0.1 - spyder ==3.2.3 - - sqlalchemy ==1.1.13 - sqlite ==3.13.0 - terminado ==0.6 - testpath ==0.3.1 @@ -157,8 +158,8 @@ requirements: - wheel ==0.29.0 - widgetsnbextension ==3.0.2 - wrapt ==1.10.11 - - xz ==5.2.2 + - xz ==5.2.3 - yaml ==0.1.6 - - zeromq ==4.1.5 + - zeromq ==4.1.3 [osx] + - zeromq ==4.1.5 [linux] - zlib ==1.2.11 - diff --git a/ska_conda/pkg_defs/ska3-dev/meta.yaml b/ska_conda/pkg_defs/ska3-dev/meta.yaml index 91091c18..6bb60300 100644 --- a/ska_conda/pkg_defs/ska3-dev/meta.yaml +++ b/ska_conda/pkg_defs/ska3-dev/meta.yaml @@ -1,6 +1,6 @@ package: name: ska3-dev - version: 0.1 + version: 0.1.3 build: noarch: generic @@ -9,190 +9,87 @@ requirements: # Packages required to run the package. These are the dependencies that # will be installed automatically whenever the package is installed. run: + # Ska packages - agasc - - alabaster - annie - - asn1crypto - - astroid - - astropy - - babel - - beautifulsoup4 - - bleach - - certifi - - cffi - chandra.cmd_states - chandra.maneuver - chandra.time - chandra_aca - - chardet - - configobj - - cryptography - - curl - cxotime - - cycler + - hopper + - kadi + - maude + - mica + - parse_cm + - quaternion + - ska.arc5gl + - ska.astro + - ska.dbi + - ska.engarchive + - ska.file + - ska.ftp + - ska.matplotlib + - ska.numpy + - ska.parsecm + - ska.quatutil + - ska.shell + - ska.sun + - ska.tdb + - ska3-template + - ska_path + - pyyaks + - tables3_api + - testr + - xija + # Installed from Ska + - sherpa + # Core packages that we want whether or not they are dependencies of Ska packages + - astropy + - beautifulsoup4 + - bokeh - cython - - db - - dbus - - decorator - django - - docutils - - entrypoints - - expat - - fontconfig - - freetype - git - - glib - - gst-plugins-base - - gstreamer + - gitpython - h5py - hdf5 - - hopper - - html5lib - - icu - - idna - - imagesize - - ipykernel - - ipyparallel - ipython - - ipython_genutils - - ipywidgets - - isort - - jbig - - jedi - jinja2 - - jpeg - - jsonschema - jupyter - jupyter_client - jupyter_console - - jupyter_core - - kadi - - krb5 - - lazy-object-proxy - - libffi - - libgcc - - libgfortran - - libiconv - - libpng - - libsodium - - libssh2 - - libtiff - - libxcb - - libxml2 - - libxslt - line_profiler - llvmlite - - lxml - - markupsafe - matplotlib - - maude - - mica - - mistune - - mkl - - mpi4py - - mpich2 + - nb_conda - nbconvert - - nbformat - networkx - - nose - notebook - numba - numexpr - numpy - numpydoc - - olefile - openssl - - packaging - pandas - - pandocfilters - - paramiko - - parse_cm - - path.py - - pcre - pep8 - - pexpect - - pickleshare - pillow - pip - - ply - - prompt_toolkit - - psutil - - ptyprocess - - py - - pyasn1 - - pycodestyle - - pycosat - - pycparser - - pycrypto - pyflakes - - pygments - pylint - - pyopenssl - - pyparsing - - pyqt - - pytables - - pytest - - python - - python-dateutil - - pytz - - pyyaks - pyyaml - - pyzmq - qt - - qtawesome - qtconsole - - qtpy - - quaternion - readline - requests - - rope - - ruamel_yaml - runipy - scikit-learn - scipy - setuptools - - sherpa - - simplegeneric - - singledispatch - - sip - six - - ska.arc5gl - - ska.astro - - ska.dbi - - ska.engarchive - - ska.file - - ska.ftp - - ska.matplotlib - - ska.numpy - - ska.parsecm - - ska.quatutil - - ska.shell - - ska.sun - - ska.tdb - - ska3-core - - ska3-flight - - ska3-template - - ska_path - - snowballstemmer - sphinx - - sphinxcontrib - - sphinxcontrib-websupport - spyder - - sqlalchemy - sqlite - - tables3_api - - terminado - - testpath - - testr - tk - - tornado - - traitlets - - wcwidth - - wheel - - widgetsnbextension - - wrapt - - xija - - xz - yaml - zeromq - - zlib diff --git a/ska_conda/pkg_defs/ska3-flight/meta.yaml b/ska_conda/pkg_defs/ska3-flight/meta.yaml index 32c93de0..d6f2daa2 100644 --- a/ska_conda/pkg_defs/ska3-flight/meta.yaml +++ b/ska_conda/pkg_defs/ska3-flight/meta.yaml @@ -1,6 +1,6 @@ package: name: ska3-flight - version: 2018.07.16 + version: 2018.07.26 build: noarch: generic @@ -9,7 +9,7 @@ requirements: # Packages required to run the package. These are the dependencies that # will be installed automatically whenever the package is installed. run: - - ska3-core ==2018.07.16 + - ska3-core ==2018.07.26 - ska3-template ==0.1 - agasc ==3.5.2 - annie ==0.5 diff --git a/ska_conda/pkg_defs/ska3-pinned/meta.yaml b/ska_conda/pkg_defs/ska3-pinned/meta.yaml index 3865fae7..c11833af 100644 --- a/ska_conda/pkg_defs/ska3-pinned/meta.yaml +++ b/ska_conda/pkg_defs/ska3-pinned/meta.yaml @@ -1,6 +1,6 @@ package: name: ska3-pinned - version: 2018.07.16 + version: 2018.07.24 build: noarch: generic @@ -12,5 +12,4 @@ requirements: - python ==3.6.2 - pip <10.0 - numpy ==1.12.1 - - conda ==4.3.21 - llvmlite ==0.18.0 diff --git a/ska_conda/pkg_defs/ska3_builder/meta.yaml b/ska_conda/pkg_defs/ska3_builder/meta.yaml index 999a629e..5aedc9fd 100644 --- a/ska_conda/pkg_defs/ska3_builder/meta.yaml +++ b/ska_conda/pkg_defs/ska3_builder/meta.yaml @@ -24,8 +24,10 @@ requirements: - ipython - gitpython - git + - conda ==4.3.21 - conda-build - - ska3-pinned ==2018.07.16 + - conda-verify + - ska3-pinned ==2018.07.24 about: home: https://github.com/sot/skare3