Skip to content

Commit

Permalink
Merge pull request #409 from JrGoodle/builld-updates
Browse files Browse the repository at this point in the history
Builld updates
  • Loading branch information
JrGoodle committed Apr 16, 2020
2 parents 54f2918 + c3a629d commit cb9c538
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 11 deletions.
23 changes: 23 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# .readthedocs.yml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

# Build documentation with MkDocs
#mkdocs:
# configuration: mkdocs.yml

# Optionally build your docs in additional formats such as PDF and ePub
# formats: all

# Optionally set the version of Python and requirements required to build your docs
python:
version: 3.7
install:
- requirements: src/requirements.txt
16 changes: 10 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
os: linux
dist: bionic
language: python
python: 3.7

env:
global:
Expand All @@ -12,15 +11,20 @@ jobs:
- os: osx
language: c
env:
- TARGET="cats"
- TARGET="llvm"
- PATH="/usr/local/bin:$PATH"
script: clowder-test -c cats all
# - env: TARGET="cocos2d"
# script: clowder-test -c cocos2d all
- env: TARGET="llvm"
script: clowder-test -c llvm all
- env: TARGET="cats"
python: 3.6
script: clowder-test -c cats all
- env: TARGET="cats"
python: 3.7
script: clowder-test -c cats all
- env: TARGET="parallel"
python: 3.7
script: clowder-test -c parallel
# - env: TARGET="cocos2d"
# script: clowder-test -c cocos2d all
# - env: TARGET="swift"
# script: clowder-test -c swift all

Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@ The primary purpose of `clowder` is synchronization of multiple repositories, so

- [git](https://git-scm.com)
- [Python 3](https://www.python.org/downloads/)
+ Note: Python 3 isn't required, but it's strongly encouraged if possible since there are a few issues with `Cement` currently preventing full command availability in Python 2

### macOS

macOS comes with `git` preinstalled. To install Python 3 with [Homebrew](https://brew.sh)

```bash
$ brew install python3
$ brew install python
```

### Ubuntu 16.04
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
# built documents.
#
# The short X.Y version.
version = u'2.4.0'
version = u'3.0.0'
# The full version, including alpha/beta/rc tags.
release = u'2.4.0'
release = u'3.0.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
1 change: 1 addition & 0 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
'Intended Audience :: Developers',
'Topic :: Software Development :: Build Tools',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
],
packages=['clowder',
Expand Down
2 changes: 1 addition & 1 deletion test/scripts/llvm/herd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export fork_paths=( 'llvm/tools/clang' \
'llvm/projects/compiler-rt' )

print_double_separator
echo 'TEST: llvm projects example test script'
echo 'TEST: Test clowder herd'
print_double_separator
cd "$LLVM_EXAMPLE_DIR" || exit 1
./clean.sh
Expand Down

0 comments on commit cb9c538

Please sign in to comment.