diff --git a/.travis.yml b/.travis.yml index 22bcd19..83b31ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,7 @@ before_install: - sudo apt-get update # We do this conditionally because it saves us some downloading if the # version is the same. - - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then - wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh; - else - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; - fi + - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; - bash miniconda.sh -b -p $HOME/miniconda - export PATH="$HOME/miniconda/bin:$PATH" - hash -r diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..cea21ed --- /dev/null +++ b/build.bat @@ -0,0 +1,2 @@ +"%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt +if errorlevel 1 exit 1 \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..7fa0f85 --- /dev/null +++ b/build.sh @@ -0,0 +1 @@ +$PYTHON setup.py install --single-version-externally-managed --record=record.txt # Python command to install the script. diff --git a/dist/README.md b/dist/README.md deleted file mode 100644 index 2a0a523..0000000 --- a/dist/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# PIQS source - -The source files for the package will be available here. We use conda-forge to -automatically build the package for multiple platforms and distribute it. diff --git a/dist/piqs-1.2.0.tar.gz b/dist/piqs-1.2.0.tar.gz deleted file mode 100644 index f58f12a..0000000 Binary files a/dist/piqs-1.2.0.tar.gz and /dev/null differ diff --git a/dist/piqs-1.2.0.zip b/dist/piqs-1.2.0.zip deleted file mode 100644 index 69958f6..0000000 Binary files a/dist/piqs-1.2.0.zip and /dev/null differ diff --git a/meta.yaml b/meta.yaml index 99c1b65..729d74f 100644 --- a/meta.yaml +++ b/meta.yaml @@ -1,25 +1,65 @@ +# Note: there are many handy hints in comments in this example -- remove them when you've finalized your recipe + +# Jinja variables help maintain the recipe as you'll update the version only here. +{% set name = "piqs" %} +{% set version = "1.2.0" %} +{% set sha256 = "13c814410228d598dddc28f842ddbea2429f821f059a8ef1695731abb02afffd" %} +# sha256 is the prefered checksum -- you can get it for a file with: +# `openssl sha256 `. +# You may need the openssl package, available on conda-forge +# `conda install openssl -c conda-forge`` + package: - name: piqs - version: "1.1" + name: {{ name|lower }} + version: {{ version }} source: - git_rev: v0.1.1 - git_url: https://github.com/nathanshammah/piqs.git + url: https://github.com/nathanshammah/piqs/archive/{{ version }}.tar.gz + sha256: {{ sha256 }} + +build: + # Uncomment the following line if the package is pure python and the recipe is exactly the same for all platforms. + # It is okay if the dependencies are not built for all platforms/versions, although selectors are still not allowed. + # See https://conda-forge.org/docs/meta.html#building-noarch-packages for more details. + # noarch: python + number: 0 + # If the installation is complex, or different between Unix and Windows, use separate bld.bat and build.sh files instead of this key. + # By default, the package will be built for the Python versions supported by conda-forge and for all major OSs. + # Add the line "skip: True # [py<35]" (for example) to limit to Python 3.5 and newer, or "skip: True # [not win]" to limit to Windows. + script: python -m pip install --no-deps --ignore-installed . requirements: build: - - python + - python>=3 - setuptools - - numpy - - cython + - numpy>=1.8 + - cython>=0.21 + run: - - python - - numpy - - cython - - scipy - - qutip + - python>=3 + - numpy>=1.8 + - cython>=0.21 + - scipy>=0.15 + - qutip>=4.2 + +test: + imports: + - piqs + - piqs.tests about: home: https://github.com/nathanshammah/piqs license: BSD license_file: LICENSE + summary: 'Efficient numerical simulation of Lindblad dynamics using permutational invariance' + + # The remaining entries in this section are optional, but recommended + doc_url: http://piqs.readthedocs.io/ + dev_url: https://github.com/nathanshammah/piqs + +extra: + recipe-maintainers: + # GitHub IDs for maintainers of the recipe. + # Always check with the people listed below if they are OK becoming maintainers of the recipe. (There will be spam!) + - sahmed95 + - nathanshammah diff --git a/setup.py b/setup.py index 9d1889b..58151b7 100755 --- a/setup.py +++ b/setup.py @@ -46,13 +46,13 @@ from Cython.Distutils import build_ext MAJOR = 1 -MINOR = 1 +MINOR = 2 MICRO = 0 -ISRELEASED = False +ISRELEASED = True VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO) REQUIRES = ['numpy (>=1.8)', 'scipy (>=0.15)', 'cython (>=0.21)', 'qutip (>=4.2)'] INSTALL_REQUIRES = ['numpy>=1.8', 'scipy>=0.15', 'cython>=0.21', 'qutip>=4.2'] -PACKAGES = ['piqs', 'piqs/cy'] +PACKAGES = ['piqs', 'piqs/cy', 'piqs/tests'] PACKAGE_DATA = { 'piqs': ['configspec.ini'], 'piqs/tests': ['*.ini'],