Commit Graph

8973 Commits

Author SHA1 Message Date
jeffy-g
c07bcf6a29 Determine the necessary changes to use db with test code,
I made necessary edits

.travis.yml
  necessary to depend on wx mod indirectly when running test code

eos\config.py
  copy from development branch, This change was necessary when using data base in test code.

service\settings.py
  copy from development branch.
  and modified SettingsProvider.getSettings and Settings.save.
  After that, we made the same as master branch except for necessary code.
  This change was necessary when using data base in test code.

and other improvement.
2017-04-10 14:23:50 +09:00
Ryan Holmes
82f6d26a88 Merge pull request #1109 from Ebag333/eos_fit_cleanup
Some quick cleanup of logging and shtuff
2017-04-09 23:25:11 -04:00
Ebag333
d1e8f5cf5c Placeholder test (#1113)
* Placeholder test

* pep8
2017-04-09 22:44:28 -04:00
Ryan Holmes
82edaf05d3 Merge pull request #1116 from pyfa-org/eos_cleanup
Eos cleanup
2017-04-09 22:43:29 -04:00
blitzmann
fadc514592 Add back the booster side effect stuff 2017-04-09 22:38:31 -04:00
jeffy-g
fc7ca56f8b searching for a way to open db with minimal changes required 2017-04-10 09:33:54 +09:00
jeffy-g
d629061506 Merge branch 'master' into fix_unread_description 2017-04-10 03:20:35 +09:00
jeffy-g
4a964ab6be apply recent improvements 2017-04-10 03:05:44 +09:00
jeffy-g
53957c24df Reflect changes when writing test code 2017-04-08 22:31:25 +09:00
Ryan Holmes
addff1118c Extend "Open Fit In Context Menu" option for command fits. (#1104) 2017-04-05 19:26:12 -04:00
Ebag333
6a1d106fea Appveyor (#1101)
Appveyor setup
2017-04-05 16:18:03 -07:00
Ryan Holmes
07f88cc4d1 Add Create and Modify fields for most database tables (#1073)
* Add created/modified fields to relevant tables.

* Add migration for created and modified fields

* Seriously tox?
2017-04-05 18:54:57 -04:00
Ryan Holmes
5f35553438 Restrict cap modules to only cap ships (#1097)
* Restrict capital modules to capital hulls

* tweak comment

* Make a isCapitalSize property for modules
2017-04-05 18:54:16 -04:00
Ebag333
802e2afcc0 General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out 2017-04-05 15:47:19 -07:00
Ebag333
ee09b41e08 Use rlock instead of lock 2017-04-05 14:56:22 -07:00
Ebag333
994bd72409 Rework pricing. 2017-04-05 14:40:27 -07:00
Ebag333
01eaba6697 First pass 2017-04-05 11:44:36 -07:00
jeffy-g
d4d69522f5 edit source 2017-04-06 03:37:40 +09:00
jeffy-g
dd88d64d67 im trying PyCharm now! 2017-04-05 21:48:37 +09:00
jeffy-g
0ecaa4d36c edit missied format... 2017-04-05 21:26:45 +09:00
jeffy-g
e9e8ef964c refactoring some code and added docstring
added stopwatch.py(modify from utils.timer.py) for test
2017-04-05 21:18:30 +09:00
Ebag333
c2360528ee Don't flush to DB 2017-04-05 01:09:00 -07:00
Ebag333
3221fba02c Copy/pasta error 2017-04-05 00:52:35 -07:00
Ebag333
c1b74f481a Tox 2017-04-05 00:44:02 -07:00
Ebag333
e2c0dc7e92 Tests for eos\saveddata\fit. 2017-04-05 00:42:19 -07:00
Ebag333
df510c40f4 Some quick cleanup of logging and shtuff 2017-04-05 00:17:13 -07:00
Ebag333
48db3c8ce4 Add some key logging for database information. 2017-04-04 15:01:05 -07:00
Ryan Holmes
9d029b46b1 Respect command fit state (#1100)
* Respect command fit state in calculations

* Utilize `getCommandInfo` instead (we do it this way for projections. Consistency, fuck yeah!)
2017-04-02 23:20:31 -05:00
Ebag333
d2af4f7d9c Locale Tests (#1079)
* Locale tests redo

* Add helper

* Remove line break if found.

* Fix imports

* Remove copy that snuck in

* Install language packs

* Change language pack install

* fix china language pack

* Fix tests that I accidentially broke

* Add debug print

* Don't try and parse Travis cache dirs

* Fix counting
2017-04-02 15:53:14 -07:00
Ryan Holmes
3dd539b4f0 Improve some efficiencies with the variations context menu: Do not recalc twice when switching items. (#1095) 2017-04-02 16:46:25 -05:00
Ebag333
1daafd15e6 Tests (#1086)
* First step in more tests

(cherry picked from commit b9af117)

* Formatting

(cherry picked from commit 5f037e6)

* Booster test fixes

* Switch to wx3.0

* try coda
* Test output

* Tweak travis

* try reduced virtualenv

* Tweak travis

* Reduce test to a single one.

* Formatting
2017-04-02 10:26:11 -07:00
jeffy-g
8fd424814a edit... 2017-04-03 02:00:10 +09:00
jeffy-g
4d8c3eadbc pep8 2017-04-03 01:50:26 +09:00
Ryan Holmes
92722d491f Remove functionality related to auto HTML export (#1088) 2017-04-02 11:46:17 -05:00
jeffy-g
c560d17bdd Improved processing status notification for import and export 2017-04-03 01:34:07 +09:00
Ebag333
55dff65142 Tox things 2017-04-02 01:03:14 -07:00
Ebag333
cdec6fad99 Clean up requirements file. Add detection and warning for possibly missing requirement. Change back to using the modal. 2017-04-02 00:57:11 -07:00
Ryan Holmes
216dac068d Fix for #1090 - using variations on implants is not recalcing fit correctly. (#1094) 2017-04-02 01:04:34 -05:00
Ryan Holmes
f9ec79c8eb Merge pull request #1093 from pyfa-org/master
Bring dev up to date with master
2017-04-01 23:14:26 -05:00
Ryan Holmes
112ab91e34 Fix for #1091 (#1092) 2017-04-01 23:09:32 -05:00
Ryan Holmes
59b0ac127f Merge pull request #1071 from blitzmann/issue-686
Switch units in recharge pane based on effective HP toggle (requested by #686)
2017-04-01 22:31:38 -05:00
Ryan Holmes
e03b3227d4 Fix for #1081 (#1085)
* Break project application code out of main item iteration, and apply it after command boosts have been applied to the fit. Fix for #1081

* Make tox happy
2017-04-01 22:23:50 -05:00
Ryan Holmes
f08a66924c Re-introduce Command Fit State (#1074)
Reintroduce command view state

Squashes `blitzmann/command-fit-state`:

* Reintroduces command view state, allowing users to toggle command fits on and off.
* Remove type() function call and use __class__ instead
2017-04-01 22:04:44 -05:00
Ebag333
535b75225b dump module list and versions 2017-03-28 18:49:10 -07:00
Ebag333
b99c44667e Remove unused import 2017-03-27 21:11:07 -07:00
Ebag333
c6d50b7d6e Merge branch 'development' into ErrorDialog_and_miscfixes 2017-03-27 21:00:51 -07:00
Ebag333
03f12bfca1 Finish implementing wx 2.8 selector. Add a bunch of error catching. General cleanup.
(cherry picked from commit b0ec69e)
2017-03-27 20:52:45 -07:00
Ebag333
78a8c105f4 First pass at re-implementing wx 2.8 preference 2017-03-27 16:57:55 -07:00
Ryan Holmes
878d9d7148 Merge pull request #1072 from blitzmann/fix-string-variables
Fix an exception caused by too few variables for string formatting
2017-03-27 00:04:42 -04:00
blitzman
cb77987129 Fix an exception caused by too few variables for string formatting 2017-03-26 23:51:05 -04:00