Skip to content

Commit 0073e15

Browse files
committed
Merge branch 'master' into enh/bosh
2 parents 8f2e841 + c9c967e commit 0073e15

26 files changed

+341
-179
lines changed

.DS_Store

6 KB
Binary file not shown.

.azure-pipelines/windows.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
parameters:
2+
name: ''
3+
vmImage: ''
4+
matrix: []
5+
6+
jobs:
7+
- job: ${{ parameters.name }}
8+
pool:
9+
vmImage: ${{ parameters.vmImage }}
10+
variables:
11+
DEPENDS: "-r min-requirements.txt"
12+
CHECK_TYPE: test
13+
strategy:
14+
matrix:
15+
${{ insert }}: ${{ parameters.matrix }}
16+
17+
steps:
18+
- task: UsePythonVersion@0
19+
inputs:
20+
versionSpec: '$(PYTHON_VERSION)'
21+
addToPath: true
22+
architecture: '$(PYTHON_ARCH)'
23+
- script: |
24+
echo %PYTHONHASHSEED%
25+
displayName: 'Display hash seed'
26+
- script: |
27+
python -m pip install --upgrade pip==18.1 setuptools==30.2.1 wheel
28+
displayName: 'Update build tools'
29+
- script: |
30+
python -m pip install %DEPENDS%
31+
displayName: 'Install dependencies'
32+
- script: |
33+
python -m pip install .[$(CHECK_TYPE)]
34+
displayName: 'Install pydra'
35+
- script: |
36+
pytest -vs -n auto --cov pydra --cov-config .coveragerc --cov-report xml:cov.xml --doctest-modules pydra
37+
displayName: 'Pytest tests'
38+

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
command: pip install --no-cache-dir -r docs/requirements.txt
5050
- run:
5151
name: Build only this commit
52-
command: make -C docs SPHINXOPTS="-W" BUILDDIR="_build/no_version_html" html
52+
command: make -C docs SPHINXOPTS="-W" BUILDDIR="_build/no_version_html" SPHINX_APIDOC_OPTIONS="members,undoc-members,show-inheritance,noindex" html
5353
- store_artifacts:
5454
path: ./docs/_build/no_version_html
5555
- run:

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ Like this:
2424
```
2525
<code>
2626
```
27-
-->
27+
-->

.github/ISSUE_TEMPLATE/question.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ Include the following:
1212
------------------------
1313
What are you trying to accomplish?
1414
What have you tried?
15-
-->
15+
-->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
- [ ] All tests passing
1313
- [ ] I have added tests to cover my changes
1414
- [ ] I have updated documentation (if necessary)
15-
- [ ] My code follows the code style of this project
16-
(we are using `black`: you can `pip install pre-commit`,
17-
run `pre-commit install` in the `pydra` directory
15+
- [ ] My code follows the code style of this project
16+
(we are using `black`: you can `pip install pre-commit`,
17+
run `pre-commit install` in the `pydra` directory
1818
and `black` will be run automatically with each commit)
1919

2020
## Acknowledgment
21-
- [ ] I acknowledge that this contribution will be available under the Apache 2 license.
21+
- [ ] I acknowledge that this contribution will be available under the Apache 2 license.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ cov.xml
1515
.*.swp
1616
*~
1717
.idea
18+
19+
.DS_Store

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ matrix:
5757
allow_failures:
5858
- python: 3.7
5959
env: INSTALL_DEPENDS="pip==10.0.1 setuptools==30.3.0"
60-
- os: windows
6160

6261

6362
before_install:

LICENSE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
1111
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
See the License for the specific language governing permissions and
1313
limitations under the License.
14-

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
include versioneer.py
22
include pydra/_version.py
3-
include pydra/schema/context.jsonld
3+
include pydra/schema/context.jsonld

0 commit comments

Comments
 (0)