Skip to content

Commit

Permalink
Merge pull request stfc#46 from gregcorbett/python3.6
Browse files Browse the repository at this point in the history
Add Python 3.6 support, drop Python 3.4 and 3.5
  • Loading branch information
gregcorbett authored Feb 2, 2018
2 parents d088004 + acc4040 commit 9b6a086
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 26 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,10 @@ scenarios.zip
*.pyc
*Thumbs.db

build/
dist/

runSciBot.spec

runSciBot.log
runSciBot.exe
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
language: python
python:
- "3.4"
- "3.5"
- "3.5-dev" # 3.5 development branch
- "3.6"
- "3.6-dev" # 3.6 development branch
- "3.7-dev" # 3.7 development branch
- "nightly"
matrix:
allow_failures:
- python: "3.5-dev"
- python: "3.6-dev"
- python: "3.7-dev"
- python: "nightly"
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
New Features and Minor Changes:

- Add a display for commands programmed into the BeeBot
- Increase supported Python versions to 3.6+

Patches, Bug Fixes and Documentation Changes:

Expand Down
40 changes: 18 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,27 @@
contact: [email protected]

## Users
The primary method to run SciBot is via the `runSciBot.exe`.

1. Go to https://github.com/stfc/SciBot/releases/latest
2. Download runSciBot.exe and scenarios.zip into the same place
3. Unzip scenarios.zip
3. Run the .exe file (by double clicking it.)
2. Download `runSciBot.exe` and `scenarios.zip` into the same place
3. Unzip `scenarios.zip`
4. Run `runSciBot.exe` (by double clicking it.)

## Developers

If you wish to develop for SciBot, clone the repository and create a feature branch off of develop. Once your feature is ready, make a Pull Request back into develop.

### Requirements for building and developing SciBot

Microsoft installers have been linked for each requirement for ease of installation.

1. Python, 3.4 or higher (https://www.python.org/downloads/)
* exact version used in testing ( https://www.python.org/ftp/python/3.4.3/python-3.4.3.msi)
2. Pygame, 1.9.2 or higher (https://bitbucket.org/pygame/pygame/downloads)
* exact version used in testing (https://bitbucket.org/pygame/pygame/downloads/pygame-1.9.2a0-hg_ea3b3bb8714a.win32-py3.4.msi)
3. py2exe 0.9.2.2 (https://pypi.python.org/pypi/py2exe/)
* exact version used in testing (https://pypi.python.org/packages/any/p/py2exe/py2exe-0.9.2.2.win32.exe)

### Building the exe file

After the requirements above are met, open a command line and navigate to the unzipped directory.

Run `python setup.py py2exe`.
If you wish to develop for SciBot, clone the repository and create a feature branch off of develop. Once your feature is ready, make a Pull Request back into develop. SciBot is written in Python 3, hence you will need to install the Python interpreter first. We recommend using [Python 3.6](https://www.python.org/ftp/python/3.6.4/python-3.6.4.exe).

### Requirements for developing, testing and building SciBot
To install SciBot's requirements, run the following command:
```
pip install -r requirements.txt
```

### Building the runSciBot.exe file
If you wish to build a new `runSciBot.exe` file, run the following command:
```
pyinstaller -F runSciBot.py
```

## Image Sources
SciBot image sourced from: https://www.tes.co.uk/teaching-resource/bee-bot-sequence-powerpoint-6415227
Expand Down
2 changes: 2 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ pygame
unittest2
coveralls
mock
# Dependencies for building
pyinstaller

0 comments on commit 9b6a086

Please sign in to comment.