Skip to content
This repository has been archived by the owner on Nov 10, 2019. It is now read-only.

Commit

Permalink
Merge branch 'release/v0.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Nunes committed Aug 11, 2016
2 parents 40daa33 + a408314 commit 2d9a310
Show file tree
Hide file tree
Showing 66 changed files with 4,167 additions and 1,056 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ coverage.xml
*.log

# Sphinx documentation
docs/_build/
docs/build/
resources/docs

# PyBuilder
target/
Expand Down
16 changes: 16 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,28 @@
language: python
sudo: required
dist: trusty
branches:
only:
- master
- develop

virtualenv:
system_site_packages: true

install:
- chmod +x ./dev/travis-bootstrap.sh
- ./dev/travis-bootstrap.sh

before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- sleep 3

script:
- chmod +x ./dev/travis-test.sh
- ./dev/travis-test.sh

after_success:
- chmod +x ./dev/travis-build.sh
- ./dev/travis-build.sh

Expand Down
40 changes: 25 additions & 15 deletions CHANGELOG.md → CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,21 +1,31 @@
# Changelog
Changelog
=========

0.7.2 (2016-07-13)
**0.8.0 (2016-08-11)**

* Documentation is now available.
* Users are now able to manipulate and add comments.
* Users are now able to hide non-comment nodes.
* 32 bit builds are now available.

----------------------------------

**0.7.2 (2016-07-13)**

* Plugin node should now have the correct required child nodes.
* Fixed validation and warning dialogs and ignore process.
* Fixed files processing in preview.

----------------------------------

0.7.1 (2016-07-12)
**0.7.1 (2016-07-12)**

* Fixed preview issue with non-existent nodes under info root.
* Updated validation and children groups.

----------------------------------

0.7.0 (2016-07-10)
**0.7.0 (2016-07-10)**

* Fixed rare bug with the validator.
* Added Dependencies Wizard.
Expand Down Expand Up @@ -48,7 +58,7 @@

----------------------------------

0.6.0 (2016-06-13)
**0.6.0 (2016-06-13)**

* Added check for updates at startup.
* Added line numbers to code preview.
Expand All @@ -57,13 +67,13 @@

----------------------------------

0.5.1 (2016-06-12)
**0.5.1 (2016-06-12)**

* Fixed versioning issues.

----------------------------------

0.5.0 (2016-06-12)
**0.5.0 (2016-06-12)**

* Added intro window.
* Added Files wizard.
Expand All @@ -79,14 +89,14 @@

----------------------------------

0.4.1 (2016-05-16)
**0.4.1 (2016-05-16)**

* Fixed wrong default attributes in file and folder tags.
* Added wizard framework.

----------------------------------

0.4.0 (2016-05-14)
**0.4.0 (2016-05-14)**

* Added file and window icons.
* Fixed combo boxes not being set at start.
Expand All @@ -106,7 +116,7 @@

----------------------------------

0.3.1 (2016-04-17)
**0.3.1 (2016-04-17)**

* Tags/item with name/source property now have that as the title instead of the tag's name.
* Fixed all keyboard shortcuts.
Expand All @@ -120,7 +130,7 @@

----------------------------------

0.3.0 (2016-04-07)
**0.3.0 (2016-04-07)**

* All basic functionality is now done.
* Tag properties are now properly displayed and editable.
Expand All @@ -132,25 +142,25 @@

----------------------------------

0.2.1 (2016-04-05)
**0.2.1 (2016-04-05)**

* In-tag text is now properly parsed and saved along with everything else.

----------------------------------

0.2.0 (2016-04-05)
**0.2.0 (2016-04-05)**

* Users can now modify the installer's objects.

----------------------------------

0.1.0 (2016-04-03)
**0.1.0 (2016-04-03)**

* Users can now open and save FOMOD installers.
* Main windows title now shows which package you are currently working on.

----------------------------------

0.0.1 (2016-03-15)
**0.0.1 (2016-03-15)**

* GUI draft completed.
38 changes: 0 additions & 38 deletions CONTRIBUTING.md

This file was deleted.

78 changes: 78 additions & 0 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
Contributing
============

We love contributions from everyone.
By participating in this project,
you agree to abide by the thoughtbot `code of conduct <https://thoughtbot.com/open-source-code-of-conduct>`_.

Issues
++++++

Before submitting your issue, please make sure that you've provided all the info
required in the issue template.

Pull Requests
+++++++++++++

Before submitting your pull request, please make sure that you've provided all the
info required in the pull request template.

Contributing Code
+++++++++++++++++

**General Guidelines**:

* This repo uses the `gitflow <https://github.com/nvie/gitflow>`_ branching model.
Don't commit directly to the ``master`` or ``develop`` branches.

* Make sure the tests pass on the CI server. Local tests are not available at the moment.

* Follow the `style guide <https://www.python.org/dev/peps/pep-0008/>`_.

* Write `decent commit messages <http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html>`_.

* Run :command:`inv docs` to generate documentation locally, :command:`inv build` to build the executable and
:command:`inv preview` to preview the app without building it.

**Setup the work environment**:

1. `Fork the repo <https://help.github.com/articles/fork-a-repo/>`_.

2. `Setup your fork locally <https://help.github.com/articles/fork-a-repo/#keep-your-fork-synced>`_.

3. This repo uses a ``.settings`` file to define all the necessary settings. This file follows this syntax:

.. code-block:: ini
[git]
user=git_username
email=git_email
Create and add this file to your clone's root.

4. Install `Vagrant <https://www.vagrantup.com/docs/installation/>`_.

5. Run this in the clone's root:

* If you have Python available:

.. code-block:: shell
pip install invoke
inv create enter
* If not:

.. code-block:: shell
vagrant up
vagrant ssh -- -Yt 'cd /vagrant/; /bin/bash'
It will take a while.

6. You should now be inside an Ubuntu Trusty virtual machine, this is where you'll work.
Make, commit and push your changes.

7. `Create a pull request <https://help.github.com/articles/creating-a-pull-request/>`_.

Thank you, `contributors <https://github.com/GandaG/fomod-editor/graphs/contributors>`_!
36 changes: 3 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,41 +1,11 @@
# FOMOD Designer
[![Build status](https://ci.appveyor.com/api/projects/status/nep4id3ammekof68?svg=true)](https://ci.appveyor.com/project/GandaG/fomod-editor) [![Build Status](https://travis-ci.org/GandaG/fomod-designer.svg?branch=develop)](https://travis-ci.org/GandaG/fomod-designer)
[![Build status](https://ci.appveyor.com/api/projects/status/nep4id3ammekof68?svg=true)](https://ci.appveyor.com/project/GandaG/fomod-editor) [![Build Status](https://travis-ci.org/GandaG/fomod-designer.svg?branch=develop)](https://travis-ci.org/GandaG/fomod-designer) [![Coverage Status](https://coveralls.io/repos/github/GandaG/fomod-designer/badge.svg?branch=develop)](https://coveralls.io/github/GandaG/fomod-designer?branch=develop) [![Documentation Status](https://readthedocs.org/projects/fomod-designer/badge/?version=stable)](http://fomod-designer.readthedocs.io/en/stable/?badge=stable)

*A visual editor to quickly create FOMOD installers for Nexus based mods.*

## Overview
## Documentation

*TODO*

## Installation

* Download the zip file corresponding to your OS from the [latest release](https://github.com/GandaG/fomod-editor/releases/latest);
* Extract the folder within to a location of your choice;
* Run the "designer" executable within the folder.

## Usage

* Open the application;
* Click on the **New/Open** button;
* Select the root folder of your package (where the files you'll install are);
* Create/modify your installer;
* Once you're ready, click on the **Save** button to save your installer.

## Contributing

This repo uses a ***.settings*** file to define all the necessary settings. This file follows this syntax:

```
[git]
user=git_username
email=git_email
```

For more information see the [CONTRIBUTING] document.
Thank you, [contributors]!

[CONTRIBUTING]: /.github/CONTRIBUTING.md
[contributors]: https://github.com/GandaG/fomod-editor/graphs/contributors
You can get more information in the official documentation hosted at [Read The Docs](http://fomod-designer.readthedocs.io/en/stable/).

## License

Expand Down
20 changes: 18 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,37 @@
branches:
only:
- master
- develop

install:
- .\dev\appveyor-bootstrap.bat

build: off

test_script:
- py.test --cov=src --cov-report html --cov-report term -vv tests/

after_test:
- if not exist %APPVEYOR_BUILD_FOLDER%\output mkdir %APPVEYOR_BUILD_FOLDER%\output

- C:\Miniconda-x64\Scripts\activate.bat fomod-designer
- inv build
- ps: cp dist\*.zip output

- C:\Miniconda\Scripts\activate.bat fomod-designer
- inv build
- ps: cp dist\*.zip output

artifacts:
- path: dist\*
- path: output\*
name: windows_build

deploy:
- provider: GitHub
auth_token:
secure: iMaZrvVT+OI/9jRs8LyOvmzVqIBa0/jpiK96wNzZww/KqKsMcferhIeSK7faNzOo
artifact: windows_build
description: '[Changelog.](https://github.com/GandaG/fomod-designer/blob/master/CHANGELOG.md)'
description: '[Changelog.](http://fomod-designer.readthedocs.io/en/stable/changelog.html)'
force_update: true
on:
appveyor_repo_tag: true
Loading

0 comments on commit 2d9a310

Please sign in to comment.