From b327b2f6b8ab0618e27af01136266125a535132c Mon Sep 17 00:00:00 2001 From: Bentley James Oakes Date: Wed, 16 May 2018 12:30:45 -0400 Subject: [PATCH] Update version to 0.7.0. --- CHANGES.md | 24 ++++++++++++++++++++++++ README.md | 52 ++++++++++++++++++++++++++-------------------------- install.txt | 20 -------------------- package.json | 8 ++++---- whatsnew.txt | 11 ----------- 5 files changed, 54 insertions(+), 61 deletions(-) create mode 100644 CHANGES.md delete mode 100644 install.txt delete mode 100644 whatsnew.txt diff --git a/CHANGES.md b/CHANGES.md new file mode 100644 index 00000000..05ec4fab --- /dev/null +++ b/CHANGES.md @@ -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 diff --git a/README.md b/README.md index 6b599e36..549ae6e8 100644 --- a/README.md +++ b/README.md @@ -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 \ No newline at end of file +Documentation can be found here: https://msdl.uantwerpen.be/documentation/AToMPM/index.html diff --git a/install.txt b/install.txt deleted file mode 100644 index de8bf521..00000000 --- a/install.txt +++ /dev/null @@ -1,20 +0,0 @@ -Installation guide for AToMPM server -------------------------------------- - -1. Installing Python and its packages -1.1. Download and install the latest Python 2.7.X (32-bit) from http://python.org/download/ -1.2. Download and install the python-igraph version 0.6.5 from https://pypi.python.org/pypi/python-igraph/0.6.5 package from http://igraph.sourceforge.net/download.html - -2. Installing AToMPM -2.1. Download and unzip the AToMPM sources from http://www-ens.iro.umontreal.ca/~syriani/atompm/atompm.htm#dev - This will create an atompm/ folder. -2.3. Download and install node.js version 0.10.31 from http://nodejs.org/#download -2.4. Run node and from atompm/ folder, run 'npm install socket.io@0.9.16' -2.5. Run 'npm install socket.io-client@0.9.16' - -3. Running AToMPM server -3.1. Execute 'node httpwsd.js' -3.2. Execute 'python mt\main.py' -3.3. With Google Chrome navigate to 'http://localhost:8124/atompm' - -A batch-file called "run.bat" in the main AToMPM folder bundles these commands (Windows only). \ No newline at end of file diff --git a/package.json b/package.json index 469b8153..5d331691 100644 --- a/package.json +++ b/package.json @@ -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" diff --git a/whatsnew.txt b/whatsnew.txt deleted file mode 100644 index 2c2086ea..00000000 --- a/whatsnew.txt +++ /dev/null @@ -1,11 +0,0 @@ -v0.5.4 -====== -*getCount() and toggleIncUpdate() commands, get more information by typing help in the input bar. If you turn off the incremental updates and your trafo doesn't have a stop, you can pause/stop the trafo, get intermediate changelogs and see that model. (of course it doesnt have an optimization logic in this, so you can get a max recursion OR memory exception very fast, which will not be visible to GUI, but it works) -*web page updated! - -v0.5.3 -====== -*Check for updates button in MainMenu toolbar. -*A bug in BRule that causes exception is fixed (code name: mmTypeData bug). -*All default toolbars now uses non-deprecated functions. -*Cardinality fix in SimpleClassDiagram.umlIcons \ No newline at end of file