Skip to content

Commit

Permalink
Merge pull request #26 from AToMPM/update-version
Browse files Browse the repository at this point in the history
Update version to 0.7.0.
  • Loading branch information
BentleyJOakes authored May 16, 2018
2 parents 2150779 + b327b2f commit 8201446
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 61 deletions.
24 changes: 24 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Changelog

All notable changes to AToMPM will be documented in this file.

## [Unreleased]

## [0.7.0] - 2018-05-16

### Added

- Add extension info when loading/saving

### Fixed

- Fixed workflows such that they now execute

### Removed

- Removed guest directory from users
- Removed autosave files from default directory

## Other
- Moved project to GitHub
- Added continuous integration
52 changes: 26 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
# AToMPM - A Tool for Multi-Paradigm Modelling

## Installation and Usage

### Windows

To install AToMPM on Windows, follow these steps:
* Download and install the latest Python 2.7.X (32-bit) from http://python.org/download/
* Download and install python-igraph from http://www.lfd.uci.edu/~gohlke/pythonlibs/#python-igraph
* Download and install node.js version 4.5.0 from https://nodejs.org/download/release/v4.5.0/
* Download and unzip the AToMPM sources from https://msdl.uantwerpen.be/git/simon/AToMPM/archive/master.zip.
## Installation

To install AToMPM, follow these steps:
* Download and install the latest Python 2.7.X
⋅⋅* Use a package manager on Linux
..* Or visit http://python.org/download/
* Download and install python-igraph
⋅⋅* Use the pip package manager (comes with Python)
..* `pip install python-igraph`
* Download and install node.js
..* Use a package manager on Linux
..* Or visit https://nodejs.org/en/download/
* Download and unzip the newest AToMPM release from https://github.com/AToMPM/atompm/releases
* In the AToMPM folder, run the command 'npm install'.

To run AToMPM on Windows, execute the `run.bat` script inside of the main AToMPM folder.

### Linux
## Usage

Download and unzip the AToMPM sources from https://msdl.uantwerpen.be/git/simon/AToMPM/archive/master.zip.
### Windows
To run AToMPM on Windows, execute the `run.bat` script inside of the main AToMPM folder.

To run AToMPM, execute the `run_AToMPM.sh` script inside of the main AToMPM folder. The first time you run this script, all dependencies are automatically downloaded and installed in the `dependencies/` folder. If, for any reason, the download process is interrupted or you experience problems with AToMPM, remove the `dependencies/` folder and run the script again.
### Mac or Linux

### Mac
* Execute commands in different terminals
..1. Execute `node httpwsd.js` in the main AToMPM folder
..2. Execute `python2 mt\main.py` in the main AToMPM folder
..3. Open a browser (preferably Chrome) and navigate to http://localhost:8124/atompm

To install AToMPM on Mac, follow these steps:
* Download and install the latest Python 2.7.X (32-bit) from http://python.org/download/
* Download and install python-igraph from http://www.lfd.uci.edu/~gohlke/pythonlibs/#python-igraph
* Download and install node.js version 4.5.0 from https://nodejs.org/download/release/v4.5.0/
* Download and unzip the AToMPM sources from https://msdl.uantwerpen.be/git/simon/AToMPM/archive/master.zip.
* In the AToMPM folder, run the command 'npm install'.
* The above steps are automated by the `run_AToMPM_local.sh` script
* Note that the `run_AToMPM.sh` script can automate the installation and usage of AToMPM
..* The first time you run this script, all dependencies are automatically downloaded and installed in the `dependencies/` folder.
..* If, for any reason, the download process is interrupted or you experience problems with AToMPM, remove the `dependencies/` folder and run the script again.

To run AToMPM on Mac, follow these steps:
* Execute `node httpwsd.js` in the main AToMPM folder
* Execute `python mt\main.py` in the main AToMPM folder
* Open a browser (preferably Chrome) and navigate to http://localhost:8124/atompm

## Documentation

Documentation can be found here: https://msdl.uantwerpen.be/documentation/AToMPM/index.html
Documentation can be found here: https://msdl.uantwerpen.be/documentation/AToMPM/index.html
20 changes: 0 additions & 20 deletions install.txt

This file was deleted.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "AToMPM",
"version": "0.6.0",
"name": "atompm",
"version": "0.7.0",
"description": "A Tool for Multi-Paradigm Modelling",
"bugs": {
"url": "https://github.com/AToMPM/atompm/issues",
"email": "simon.vanmierlo@uantwerpen.be"
"url": "https://github.com/AToMPM/atompm/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/AToMPM/atompm"
},
"homepage": "https://github.com/AToMPM/atompm",
"dependencies": {
"socket.io": "^0.9.19",
"socket.io-client": "^0.9.16"
Expand Down
11 changes: 0 additions & 11 deletions whatsnew.txt

This file was deleted.

0 comments on commit 8201446

Please sign in to comment.