Skip to content

Commit

Permalink
Merge pull request #59 from ctk3b/tidy
Browse files Browse the repository at this point in the history
Re-introduce proper conda packaging
  • Loading branch information
ctk3b authored Feb 14, 2017
2 parents f933de9 + 7bb9b53 commit d15cfc6
Show file tree
Hide file tree
Showing 332 changed files with 111 additions and 81 deletions.
14 changes: 8 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@ matrix:
- { os: linux, env: PYTHON_VERSION=3.5 }
- { os: osx, env: PYTHON_VERSION=3.5 }

env:
global:
- ENCRYPTION_LABEL: "898e0934cf65"
- COMMIT_AUTHOR_EMAIL: "janos.sallai@vanderbilt.edu"

install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install md5sha1sum; fi
- git fetch -t
- source devtools/travis-ci/install_conda.sh
- conda config --add channels omnia
- conda config --add channels bioconda
- conda install -yq libpng=1.6.22 matplotlib networkx oset six pytest mdtraj oset openmm nglview
- pip install parmed
- pip install plyplus
- pip install git+http://github.com/imodels/mbuild.git#egg=mbuild
- pip install -e .
- conda config --add channels mosdef

script:
- py.test -v
- conda build devtools/conda-recipe
6 changes: 4 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
graft opls_validation
graft foyer/opls_validation
graft foyer/forcefields
graft examples
include foyer/tests/*.txt
include requirements.txt
include foyer/tests/files/*
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
#### Foyer: A package for atom-typing as well as applying and disseminating forcefields

[![Linux Build Status](https://travis-ci.org/iModels/foyer.svg?branch=master)](https://travis-ci.org/iModels/foyer)
[![Linux Build Status](https://travis-ci.org/mosdef-hub/foyer.svg?branch=master)](https://travis-ci.org/mosdef-hub/foyer)
[![PyPI Version](https://badge.fury.io/py/foyer.svg)](https://pypi.python.org/pypi/foyer)
[![Anaconda Badge](https://anaconda.org/mosdef/foyer/badges/version.svg)](https://anaconda.org/mosdef/foyer)

Install from conda:
```bash
conda install -c omnia -c bioconda -c mosdef foyer
```

Install from source:
```python
git clone https://github.com/iModels/foyer.git
```bash
git clone https://github.com/mosdef-hub/foyer.git
cd foyer
pip install .
```
2 changes: 1 addition & 1 deletion devtools/conda-recipe/bld.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
xcopy %RECIPE_DIR%\\..\\.. %SRC_DIR% /e /h /Y /Q
"%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt
"%PYTHON%" setup.py install
if errorlevel 1 exit 1
3 changes: 2 additions & 1 deletion devtools/conda-recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash

chmod -R +w $SRC_DIR
cp -r $RECIPE_DIR/../.. $SRC_DIR
$PYTHON setup.py clean
$PYTHON setup.py install --single-version-externally-managed --record=record.txt
$PYTHON setup.py install
22 changes: 18 additions & 4 deletions devtools/conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
package:
name: foyer-dev
version: !!str 0.1.0.dev0
name: foyer
version: {{ GIT_DESCRIBE_TAG }}

source:
path: ../../

build:
number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0)}}
script: python setup.py install --single-version-externally-managed --record record.txt

build:
noarch_python: True
Expand All @@ -12,6 +19,7 @@ requirements:
run:
- python
- parmed
- mbuild
- networkx
- oset
- six
Expand All @@ -20,11 +28,17 @@ requirements:

test:
requires:
- pytest
- pytest >=3.0

source_files:
- foyer/forcefields/*
- foyer/opls_validation/*
- foyer/tests/files/*

commands:
- py.test -v --tb=short --pyargs foyer

about:
home: http://imodels.github.io/foyer
home: http://mosdef-hub.github.io/foyer
license: MIT
summary: Atomtyping and forcefield applying.
12 changes: 0 additions & 12 deletions devtools/travis-ci/create_docs.sh

This file was deleted.

25 changes: 0 additions & 25 deletions devtools/travis-ci/post_binstar.sh

This file was deleted.

3 changes: 2 additions & 1 deletion foyer/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
from foyer.forcefield import Forcefield
from foyer.forcefield import Forcefield
from foyer.version import *
2 changes: 1 addition & 1 deletion foyer/forcefield.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def included_forcefields(self):
return self._included_forcefields

resource_extension = '.xml'
ff_dir = resource_filename('foyer', '../forcefields')
ff_dir = resource_filename('foyer', 'forcefields')
ff_filepaths = set(glob.glob(os.path.join(ff_dir, '*'+resource_extension)))

for ff_filepath in ff_filepaths:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit d15cfc6

Please sign in to comment.