From 38ac41bccb59949fe3109dae324e9bc36271e4c9 Mon Sep 17 00:00:00 2001 From: Mark N Broadhead Date: Tue, 29 Mar 2016 11:18:52 -0600 Subject: [PATCH 1/6] Remove contact info for Kadeshs per blitzmann Kadeshs is no longer with the projects per a conversation with blitzmann on 29/3/2016 in gitter. He has requested I remove the contact info. --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 762cbac58..e7301491c 100644 --- a/README.md +++ b/README.md @@ -46,9 +46,6 @@ pyfa is licensed under the GNU GPL v3.0, see LICENSE * [EVE Online website](http://www.eveonline.com/) ## Contacts: -* Kadesh Priestess - * GitHub: @DarkFenX - * [TweetFleet Slack](https://www.fuzzwork.co.uk/tweetfleet-slack-invites/): @kadesh * Sable Blitzmann * GitHub: @blitzmann * [TweetFleet Slack](https://www.fuzzwork.co.uk/tweetfleet-slack-invites/): @blitzmann From 4b167ba9de2997ae11d5125371239f1a5ac44605 Mon Sep 17 00:00:00 2001 From: Mark N Broadhead Date: Tue, 29 Mar 2016 11:45:08 -0600 Subject: [PATCH 2/6] Add gitter chat link in contact information section --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e7301491c..73c0aa7d7 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ pyfa is licensed under the GNU GPL v3.0, see LICENSE * Sable Blitzmann * GitHub: @blitzmann * [TweetFleet Slack](https://www.fuzzwork.co.uk/tweetfleet-slack-invites/): @blitzmann + * [Gitter chat](https://gitter.im/pyfa-org/Pyfa): @ blitzmann * Email: sable.blitzmann@gmail.com ## CCP Copyright Notice From 5fd170d480330b439314a98a109f68d1701f5100 Mon Sep 17 00:00:00 2001 From: Mark N Broadhead Date: Tue, 29 Mar 2016 11:46:08 -0600 Subject: [PATCH 3/6] Rename requirements to dependencies --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 73c0aa7d7..b2c230f2f 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The latest version along with release notes can always be found on the projects ## Installing Windows and OS X users are supplied self-contained builds of pyfa that can be run without additional software. An `.exe` installer is also available for the Windows builds. There is no self-contained package for Linux users, which are expected to run pyfa through their distributions Python interpreter. However, there are a number of third-party packages available that handle the dependencies and updates for pyfa (for example, [pyfa for Arch Linux](https://aur.archlinux.org/packages/pyfa/)). Please check your distributions repositories. -### Requirements +### Dependencies If you wish to help with development or simply need to run pyfa through a Python interpreter, the following software is required: * Python 2.7 From 015c195c9f8ac7ce049c30cd7ca747b2f51b76b3 Mon Sep 17 00:00:00 2001 From: Mark N Broadhead Date: Tue, 29 Mar 2016 11:52:55 -0600 Subject: [PATCH 4/6] Move Package list closer to installation section and add link It makes sense for the Linux Distro-specific Packages section to immediately follow the text about 3rd party repos in the Installing section * Move Linux Distro-specific Packages section * Add link to issue #484 for FreeBSD installation --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b2c230f2f..2e6cb490c 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,14 @@ The latest version along with release notes can always be found on the projects ## Installing Windows and OS X users are supplied self-contained builds of pyfa that can be run without additional software. An `.exe` installer is also available for the Windows builds. There is no self-contained package for Linux users, which are expected to run pyfa through their distributions Python interpreter. However, there are a number of third-party packages available that handle the dependencies and updates for pyfa (for example, [pyfa for Arch Linux](https://aur.archlinux.org/packages/pyfa/)). Please check your distributions repositories. +### Linux Distro-specific Packages +The following is a list of pyfa packages available for certain distros. Please note that these packages are maintained by third-parties and are not evaluated by the pyfa developers. + +* Debian/Ubuntu/derivitives: https://github.com/AdamMajer/Pyfa/releases +* Arch: https://aur.archlinux.org/packages/pyfa/ +* openSUSE: https://build.opensuse.org/package/show/home:rmk2/pyfa +* FreeBSD: http://www.freshports.org/games/pyfa/ (see [#484](https://github.com/pyfa-org/Pyfa/issues/484) for instructions) + ### Dependencies If you wish to help with development or simply need to run pyfa through a Python interpreter, the following software is required: @@ -24,14 +32,6 @@ If you wish to help with development or simply need to run pyfa through a Python * `matplotlib` (for some Linux distributions, you may need to install separate wxPython bindings, such as `python-matplotlib-wx`) * `requests` -### Linux Distro-specific Packages -The following is a list of pyfa packages available for certain distros. Please note that these packages are maintained by third-parties and are not evaluated by the pyfa developers. - -* Debian/Ubuntu/derivitives: https://github.com/AdamMajer/Pyfa/releases -* Arch: https://aur.archlinux.org/packages/pyfa/ -* openSUSE: https://build.opensuse.org/package/show/home:rmk2/pyfa -* FreeBSD: http://www.freshports.org/games/pyfa/ (see #484 for instructions) - ## Bug Reporting The preferred method of reporting bugs is through the projects GitHub Issues interface. Alternatively, posting a report in the pyfa thread on the official EVE Online forums is acceptable. Guidelines for bug reporting can be found on [this wiki page](https://github.com/DarkFenX/Pyfa/wiki/Bug-Reporting). From ca81d2d6024e9272261daf9f96d9463441ff4bea Mon Sep 17 00:00:00 2001 From: Mark N Broadhead Date: Tue, 29 Mar 2016 12:04:48 -0600 Subject: [PATCH 5/6] Reword Installing section * Reword text and include link to latest builds page * Remove link to Arch repo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e6cb490c..1783fa2cb 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ pyfa, short for **py**thon **f**itting **a**ssistant, allows you to create, expe The latest version along with release notes can always be found on the projects [Releases](https://github.com/DarkFenX/Pyfa/releases) page. pyfa will notify you if you are running an outdated version. ## Installing -Windows and OS X users are supplied self-contained builds of pyfa that can be run without additional software. An `.exe` installer is also available for the Windows builds. There is no self-contained package for Linux users, which are expected to run pyfa through their distributions Python interpreter. However, there are a number of third-party packages available that handle the dependencies and updates for pyfa (for example, [pyfa for Arch Linux](https://aur.archlinux.org/packages/pyfa/)). Please check your distributions repositories. +Windows and OS X users are supplied self-contained builds of pyfa on the [latest releases](https://github.com/pyfa-org/Pyfa/releases/latest) page. An `.exe` installer is also available for Windows builds. Linux users can run pyfa using their distribution's Python interpreter. There is no official self-contained package for Linux, however, there are a number of third-party packages available through distribution-specific repositories. ### Linux Distro-specific Packages The following is a list of pyfa packages available for certain distros. Please note that these packages are maintained by third-parties and are not evaluated by the pyfa developers. From 126b807dc74d2907d8ae384dba0221aa5205b634 Mon Sep 17 00:00:00 2001 From: Mark N Broadhead Date: Tue, 29 Mar 2016 12:09:22 -0600 Subject: [PATCH 6/6] Add links and make punctuation and stylistic changes I am making changes here to help the README be consistent in its styling and gramatically correct. Specifically distro vs distribution and places where there are no links where they would be useful. * Add link to GitHub Issues * Add link to EVE pyfa forum thread * Rename Installing to Installation * Change distros to distributions * Add apostrophe to "projects" where it is posessive --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1783fa2cb..340eec53f 100644 --- a/README.md +++ b/README.md @@ -9,13 +9,13 @@ pyfa, short for **py**thon **f**itting **a**ssistant, allows you to create, experiment with, and save ship fittings without being in game. Open source and written in Python, it is available on any platform where Python 2.x and wxWidgets are available, including Windows, Mac OS X, and Linux. ## Latest Version and Changelogs -The latest version along with release notes can always be found on the projects [Releases](https://github.com/DarkFenX/Pyfa/releases) page. pyfa will notify you if you are running an outdated version. +The latest version along with release notes can always be found on the project's [Releases](https://github.com/DarkFenX/Pyfa/releases) page. pyfa will notify you if you are running an outdated version. -## Installing +## Installation Windows and OS X users are supplied self-contained builds of pyfa on the [latest releases](https://github.com/pyfa-org/Pyfa/releases/latest) page. An `.exe` installer is also available for Windows builds. Linux users can run pyfa using their distribution's Python interpreter. There is no official self-contained package for Linux, however, there are a number of third-party packages available through distribution-specific repositories. ### Linux Distro-specific Packages -The following is a list of pyfa packages available for certain distros. Please note that these packages are maintained by third-parties and are not evaluated by the pyfa developers. +The following is a list of pyfa packages available for certain distributions. Please note that these packages are maintained by third-parties and are not evaluated by the pyfa developers. * Debian/Ubuntu/derivitives: https://github.com/AdamMajer/Pyfa/releases * Arch: https://aur.archlinux.org/packages/pyfa/ @@ -29,11 +29,11 @@ If you wish to help with development or simply need to run pyfa through a Python * `wxPython` 2.8/3.0 * `sqlalchemy` >= 0.6 * `dateutil` -* `matplotlib` (for some Linux distributions, you may need to install separate wxPython bindings, such as `python-matplotlib-wx`) +* `matplotlib` (for some Linux distributions you may need to install separate wxPython bindings such as `python-matplotlib-wx`) * `requests` ## Bug Reporting -The preferred method of reporting bugs is through the projects GitHub Issues interface. Alternatively, posting a report in the pyfa thread on the official EVE Online forums is acceptable. Guidelines for bug reporting can be found on [this wiki page](https://github.com/DarkFenX/Pyfa/wiki/Bug-Reporting). +The preferred method of reporting bugs is through the project's [GitHub Issues interface](https://github.com/pyfa-org/Pyfa/issues). Alternatively, posting a report in the [pyfa thread](http://forums.eveonline.com/default.aspx?g=posts&t=247609) on the official EVE Online forums is acceptable. Guidelines for bug reporting can be found on [this wiki page](https://github.com/DarkFenX/Pyfa/wiki/Bug-Reporting). ## License pyfa is licensed under the GNU GPL v3.0, see LICENSE