diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000000000000000000000000000000000000..13b227920240fca5f181065c198917054e69f84b --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,39 @@ +version: '0.8.1.{build}' + +image: Visual Studio 2017 + +platform: + - x64 + +configuration: + - Release + +install: + - git submodule update --init --recursive + - call C:\\Miniconda36-x64\Scripts\activate.bat + - conda config --set always_yes yes --set changeps1 no + - conda update -q conda + - conda install conda-build anaconda-client + - conda env create -n ale python=3.7.3 + - conda env update -f environment.yml -n ale + - conda activate ale + +before_build: + - mkdir build + - cd build + +build_script: + - python ..\setup.py install + - cmake -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -G "Visual Studio 15 2017 Win64" -DALE_BUILD_TESTS=OFF .. + - cmake --build . --target ALL_BUILD --config Release + +artifacts: + - path: build\Release\ale.dll + name: ale.dll + - path: build\Release\ale.lib + name: ale.lib + +on_success: + - call C:\\Miniconda36-x64\Scripts\activate.bat + - cd ../ + - conda build -c conda-forge recipe/ diff --git a/.travis.yml b/.travis.yml index edc87c644d1e1bb99f43064c90a7fdb10ec2ba4a..8b4bddddc164277290e79d9ea8cf5a680a20e27a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,6 @@ install: - conda env create -n ale python=3.7.3 - conda env update -f environment.yml -n ale - source activate ale - - | - if [ "$TRAVIS_OS_NAME" == "osx" ]; then - install_name_tool -change @rpath/libiomp5.dylib @loader_path/libiomp5.dylib ${CONDA_PREFIX}/lib/libmkl_intel_thread.dylib; - fi - conda install pytest script: diff --git a/environment.yml b/environment.yml index c7af6ecc5d662936f0150ffed371cdb8b7c506ed..9d26978891cc106f820dbd7e7ba6b0a13dcc0edc 100644 --- a/environment.yml +++ b/environment.yml @@ -2,7 +2,6 @@ name: ale channels: - conda-forge - default - - usgs-astrogeology dependencies: - cmake>=3.10 @@ -11,11 +10,10 @@ dependencies: - jupyter - nlohmann_json - numpy - - openblas>=0.3.0 - pvl - - python=3.7.1 + - python - python-dateutil - scipy - - spiceypy=2.2.2 + - spiceypy>=2.3.0 - pyyaml - networkx diff --git a/recipe/bld.bat b/recipe/bld.bat new file mode 100644 index 0000000000000000000000000000000000000000..21e7e72e136359a8b0740224d606a9ec0d6734ae --- /dev/null +++ b/recipe/bld.bat @@ -0,0 +1,19 @@ +mkdir build +cd build + +cmake -GNinja ^ + -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON ^ + -DALE_BUILD_TESTS=OFF ^ + -DCMAKE_INSTALL_PREFIX="%PREFIX%" ^ + -DCMAKE_INSTALL_LIBDIR="%LIBRARY_LIB%" ^ + -DCMAKE_INSTALL_INCLUDEDIR="%LIBRARY_INC%" ^ + -DCMAKE_INSTALL_BINDIR="%LIBRARY_BIN%" ^ + -DCMAKE_INSTALL_DATADIR="%LIBRARY_PREFIX%" ^ + .. + +cmake --build . --target install --config Release + +cd .. +pip install . --no-deps -vv + +if errorlevel 1 exit 1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dae59eb2c5df55ae9ba30da880db4a5f36d0528f..40808ab6458fc97801fff5f71c6178e64a325bf0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "0.0" %} +{% set version = "0.8.1" %} {% set git_branch = "master" %} {% set build_number = "0" %} @@ -13,33 +13,32 @@ source: build: number: {{ build_number }} -# A number of the requirements below will have two instances: one will include a specific version -# pinning, while the other one will not. When building a version of ALE for use specifically within -# ISIS, use the instances with the version pinned. For all other builds, use the unpinned instances. -# (Confirm that every requirement has one and only one instance uncommented.) -# -# ISIS requires pinned versions for these dependencies to avoid conflicts with other dependencies. -# Make sure to always confirm that version numbers in this file and version numbers in the -# meta.yaml file within the ISIS3 repo match for each dependency before building this library -# for use within ISIS, and always upload this special ISIS build with the "isis" tag. requirements: build: - - cmake>=3.10 - - eigen + - cmake>=3.10 + - eigen + host: + - pip + - python + - nlohmann_json run: - - eigen - - networkx - - numpy - - openblas - - python - - python-dateutil - - pvl - - pysis - - spiceypy + - networkx + - numpy + - pvl + - python + - python-dateutil + - scipy >=1.2.0 + - spiceypy >=2.3.0 + - pyyaml -# Add the tests eventually -# test: -# +test: + imports: + - ale + commands: + - conda inspect linkages -p $PREFIX $PKG_NAME # [not win] + - test -e $PREFIX/lib/libale${SHLIB_EXT} # [unix] + - if not exist %LIBRARY_BIN%\ale.dll exit 1 # [win] + - if not exist %LIBRARY_LIB%\ale.lib exit 1 # [win] # about: # home: