Skip to content

Commit

Permalink
Merge pull request #41 from MolSSI/setuptest
Browse files Browse the repository at this point in the history
pytest requirement update
  • Loading branch information
dgasmith committed Mar 4, 2019
2 parents ed13952 + e1b86e7 commit bcc7a28
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 48 deletions.
10 changes: 0 additions & 10 deletions devtools/README.md
Expand Up @@ -16,16 +16,6 @@ Windows testing if you only plan to deploy on specific platforms. These are just
* `appveyor`: Windows based testing through [AppVeyor](https://www.appveyor.com/)
* `install_conda.ps1` Powershell installation script of Conda components

### Conda Recipe:

This directory contains the files to build and deploy on [Conda](https://conda.io/).

* `conda-recipie`: directory containing all the build objects required for Conda. All files in this folder must have their given names
* `meta.yaml`: The yaml file needed by Conda to construct the build
* `build.sh`: Unix-based instructions for how to install the software interpreted by Conda
* `bld.bat`: Windows-based instructions for how to install the software interpreted by Conda


## How to contribute changes
- Clone the repository if you have write access to the main repo, fork the repository if you are a collaborator.
- Make a new branch with `git checkout -b {your branch name}`
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-envs/base.yaml
Expand Up @@ -11,6 +11,6 @@ dependencies:
- pydantic>=0.20

# Testing
- pytest
- pytest>=3.9.1
- pytest-cov
- codecov
2 changes: 0 additions & 2 deletions devtools/conda-recipe/bld.bat

This file was deleted.

4 changes: 0 additions & 4 deletions devtools/conda-recipe/build.sh

This file was deleted.

29 changes: 0 additions & 29 deletions devtools/conda-recipe/meta.yaml

This file was deleted.

7 changes: 5 additions & 2 deletions setup.py
Expand Up @@ -43,18 +43,21 @@
'sphinx_rtd_theme',
],
'tests': [
'pytest',
'pytest >= 3.9.1',
'pytest-cov',
],
},
tests_require=[
'pytest',
'pytest >= 3.9.1',
'pytest-cov',
],
classifiers=[
'Development Status :: 4 - Beta',
'Intended Audience :: Science/Research',
'Programming Language :: Python :: 3 :: Only',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
],
zip_safe=False,
long_description=long_description,
Expand Down

0 comments on commit bcc7a28

Please sign in to comment.