Skip to content
This repository has been archived by the owner on Oct 31, 2020. It is now read-only.

Commit

Permalink
Release version 1.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
tbekolay committed Jul 12, 2017
1 parent 0675641 commit bd8121c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 21 deletions.
29 changes: 12 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,18 @@ script:
source activate test;
pip install -r docs/requirements.txt;
sphinx-build -W docs docs/_build;
export DATE=$(date '+%Y-%m-%d %T');
git config --global user.email "travis@travis-ci.org";
git config --global user.name "TravisCI";
ghp-import -m "Last update at $DATE" -b gh-pages docs/_build;
git push -fq "https://$GH_TOKEN@github.com/nengo/nengo_1.4.git" gh-pages;
fi

deploy:
- provider: releases
api_key: "$GH_TOKEN"
file: "nengo-latest.zip"
skip_cleanup: true
on:
branch: master
jdk: oraclejdk7
tags: true
- provider: pages
skip_cleanup: true
github_token: "$GH_TOKEN"
local_dir: docs/_build
target_branch: gh-pages
on:
branch: master
jdk: oraclejdk7
tags: true
provider: releases
api_key: "$GH_TOKEN"
file: "nengo-latest.zip"
skip_cleanup: true
on:
jdk: oraclejdk7
tags: true
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"Theoretical Neuroscience, University of Waterloo")
author = ("Bryan Tripp & Centre for Theoretical Neuroscience, "
"University of Waterloo")
version = "1.4.0"
version = "1.4.1"
release = "1.4"
language = None

Expand Down
4 changes: 2 additions & 2 deletions simulator-ui/src/java/main/ca/nengo/ui/NengoGraphics.java
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ public class NengoGraphics extends AppFrame implements NodeContainer {
private static final long serialVersionUID = 1L;

/**
* Nengo version number, no real rhyme or reason to it
* Nengo version number
*/
public static final String VERSION = "1.4.0";
public static final String VERSION = "1.4.1";

/**
* String used in the UI to identify Nengo
Expand Down
2 changes: 1 addition & 1 deletion simulator/src/resources/ca/nengo/ui/nengo.desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
Version=1.4.0
Version=1.4
Name=Nengo
Comment=Large-scale neural simulator
Exec=nengo
Expand Down

0 comments on commit bd8121c

Please sign in to comment.