Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jmsv/ety-python
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: jmsv/ety-python
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: data-restructure
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 16 files changed
  • 2 contributors

Commits on Jun 20, 2018

  1. swapped to more complete .json 

    file is considerable larger and causes the library to take longer to load in but owing to the restructuring it's quicker to use
also contains many more entries:

```console
$ ety international shipping of products including games books and movies
international (English)
 • national (English)
 • inter- (English)

shipping (English)
 • ship (English)

of (English)
 • of (Middle English (1100-1500))

products (English)
 • product (English)

including (English)
 • include (English)

games (English)
 • game (English)

books (English)
 • book (English)

and (English)
 • and (Middle English (1100-1500))

movies (English)
 • movie (English)
 ```

 instead of

 ```console
 $ ety international shipping of products including games books and movies
No origins found for word: international
No origins found for word: shipping
No origins found for word: products
No origins found for word: including
No origins found for word: games
No origins found for word: books
No origins found for word: movies
of (English)
 • of (Middle English (1100-1500))

and (English)
 • and (Middle English (1100-1500))
```
    @parker57
    parker57 committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    3b89739 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:jmsv/ety-python 

    # Conflicts:
#	ety/__init__.py
#	ety/word.py

updated random word method and made it case sensitive again
    @parker57
    parker57 committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    5618d59 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:jmsv/ety-python 

    # Conflicts:
#	ety/__init__.py
#	ety/word.py

updated random word method and made it case sensitive again
    @parker57
    parker57 committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    99436f6 View commit details
    Browse the repository at this point in the history

  4. untracked file in gitignore

    @parker57
    parker57 committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    d15d15a View commit details
    Browse the repository at this point in the history

  5. Revert "swapped to more complete .json" 

    This reverts commit 3b89739
    @parker57
    parker57 committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    b8e4498 View commit details
    Browse the repository at this point in the history

  6. Swapped to etymologies.json 

    more data and restructured
see: https://github.com/parker57/making-sense-of-etymwn
    @parker57
    parker57 committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    2278b31 View commit details
    Browse the repository at this point in the history

  7. updated test method

    @parker57
    parker57 committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    bed38c1 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2018

  1. Merge branch 'master' into data-restructure

    @jmsv
    jmsv committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    21a1f39 View commit details
    Browse the repository at this point in the history

  2. Allow slower circular origins test

    @jmsv
    jmsv committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    86d7698 View commit details
    Browse the repository at this point in the history

  3. Download/generate script via Makefile:data

    @jmsv
    jmsv committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    ca720b0 View commit details
    Browse the repository at this point in the history

  4. Use FileNotFound base class to fix Python 2 check

    @jmsv
    jmsv committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    8759cfc View commit details
    Browse the repository at this point in the history
Loading