Skip to content

Commit

Permalink
editorconfig and readme tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
gwax committed May 28, 2017
1 parent eaae6c3 commit 9897b1c
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 52 deletions.
6 changes: 0 additions & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,5 @@ end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8

[*.py]
indent_style = space
indent_size = 4

[*.md,*.rst]
indent_style = space
indent_size = 2
92 changes: 46 additions & 46 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ merge from an existing collection using the "deckbox" import format:

.. code:: bash
mtg-ssm --dialect csv deckbox merge collection.xlsx Inventory_username_2016.March.10.csv
mtg-ssm --dialect csv deckbox merge collection.xlsx Inventory_username_2016.March.10.csv
Alternatively, if you have your collection in a spreadsheet already and would
like to load your data into deckbox to check prices or share with other people,
just go the other direction.

.. code:: bash
mtg-ssm --dialect csv deckbox merge inventory.csv collection.xlsx
mtg-ssm --dialect csv deckbox merge inventory.csv collection.xlsx
Deckbox Warning
~~~~~~~~~~~~~~~
Expand All @@ -118,11 +118,11 @@ export to the other; going back and forth is probably not a good idea.

The following conversion issues are known to exist:

- Sets that contain multiple versions of the same card (ex. Thallid in Fallen
Empires) may lose track of the specific version when going back and forth.
- Alternate art cards (ex. Ertai, the Corrupted in Planeshift) may lose track
of the art version when going back and forth.
- Not all Clash Pack cards are available in mtg-ssm.
- Sets that contain multiple versions of the same card (ex. Thallid in Fallen
Empires) may lose track of the specific version when going back and forth.
- Alternate art cards (ex. Ertai, the Corrupted in Planeshift) may lose track
of the art version when going back and forth.
- Not all Clash Pack cards are available in mtg-ssm.

Contributions
=============
Expand All @@ -134,13 +134,13 @@ Issues can be reported via GitHub.
Acknowledgments
===============

- `Wizards of the Coast`_: For making Magic: the Gathering and continuing
to support it. Off and on, it's been my favorite hobby since the
early '90s.
- `MTG JSON`_: MTG JSON is an amazing resource for anyone looking to build
tools around magic card data. It is pretty much **THE** source for
structured magic card data. Without MTG JSON this project would not have
been possible.
- `Wizards of the Coast`_: For making Magic: the Gathering and continuing
to support it. Off and on, it's been my favorite hobby since the
early '90s.
- `MTG JSON`_: MTG JSON is an amazing resource for anyone looking to build
tools around magic card data. It is pretty much **THE** source for
structured magic card data. Without MTG JSON this project would not have
been possible.

.. _Wizards of the Coast: http://magic.wizards.com
.. _MTG JSON: http://mtgjson.com
Expand All @@ -152,85 +152,85 @@ Changelog
1.3.3
-----

- Fixed support for Ae/Æ
- Increased verbosity when searching for cards with a mismatched id
- Performance improvements
- Add tests to catch potential missing card issues
- Fixed support for Ae/Æ
- Increased verbosity when searching for cards with a mismatched id
- Performance improvements
- Add tests to catch potential missing card issues

1.3.2
-----

- Changed the backup file naming convention; date is now before extension
- Minor tweaks and performance enhancements
- Changed the backup file naming convention; date is now before extension
- Minor tweaks and performance enhancements

1.3.1
-----

- Fix bug where were were never actually reading set names from xlsx
files.
- Fix bug where were were never actually reading set names from xlsx
files.

1.3.0
-----

- Complete rework of cli (see `--help` for details)
- Complete rework of cli (see `--help` for details)

- cli is **NOT** the same; old commands will **NOT** work
- new global argument flags and dialect selection mechanisms
- create: create a new collection
- update: update an existing collection
- merge: merge multiple collections
- diff: get a diff of two collections
- cli is **NOT** the same; old commands will **NOT** work
- new global argument flags and dialect selection mechanisms
- create: create a new collection
- update: update an existing collection
- merge: merge multiple collections
- diff: get a diff of two collections

- Lots of under the hood changes and performance improvements
- Files are still compatible
- Lots of under the hood changes and performance improvements
- Files are still compatible

1.2.4
-----

- Remove workarounds introduced in 1.2.3
- Remove workarounds introduced in 1.2.3

1.2.3
-----

- Hack to work around missing "releaseDate" and "type" in MTG JSON 3.3.14
- Hack to work around missing "releaseDate" and "type" in MTG JSON 3.3.14

1.2.2
-----

- Add "All Cards" page with index of all cards in XlsxSerializer.
- Add "All Cards" page with index of all cards in XlsxSerializer.

1.2.1
-----

- Add support for deckbox.org import/export.
- Backend improvements.
- Add support for deckbox.org import/export.
- Backend improvements.

1.2.0
-----

- Complete rework of the serialization architecture.
- Rebuild of the manager cli.
- Incompatible CLI interface changes. See help for new usage information.
- Complete rework of the serialization architecture.
- Rebuild of the manager cli.
- Incompatible CLI interface changes. See help for new usage information.

1.1.0
-----

- Complete rework of the data model storage. Drop sqlite based data models in
favor of custom classes and dict based indexes.
- Switch to accepting all versions of MTGJSON instead of bumping for every
release.
- Complete rework of the data model storage. Drop sqlite based data models in
favor of custom classes and dict based indexes.
- Switch to accepting all versions of MTGJSON instead of bumping for every
release.

1.0.2
-----

- Version bump MTGJSON support.
- Version bump MTGJSON support.

1.0.1
-----

- Fixed some PyPI related issues.
- Fixed some PyPI related issues.

1.0.0
-----

- Initial stable release.
- Initial stable release.

0 comments on commit 9897b1c

Please sign in to comment.