.github/workflows/python-publish.yml

@@ -6,10 +6,10 @@ name: Upload Python Package
 on:
   release:
     types: [created]
-  workflow_dispatch:
 
 jobs:
   deploy:
+
     runs-on: ubuntu-latest
 
     steps:
@@ -24,8 +24,8 @@ jobs:
         pip install setuptools wheel twine
     - name: Build and publish
       env:
-          TWINE_USERNAME: __token__
+        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_TOKEN }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
         python setup.py sdist bdist_wheel
         twine upload dist/*

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
 
     steps:
       - uses: actions/checkout@v2

docs/scrython.catalog/AbilityWords.md

@@ -1,66 +0,0 @@
-# **class** `scrython.catalog.AbilityWords()`
-
-These docs will likely not be as detailed as the official Scryfall Documentation, and you should reference that for more information.
-
->In the event that a key isn't found or has been changed, you can access the full JSON output with the `scryfallJson` variable (`AbilityWords().scryfallJson`).
-
-## Args
-
-|arg|type|description|
-|:---:|:---:|:---:|
-
-## Returns
-N/A
-
-## Raises
-N/A
-
-## Examples
-```python
->>> catalog = scrython.catalog.KeywordAbilities() 
->>> catalog.data() 
-```
-
-## Methods
-
----
-### `data()`
-
-```
-A list of all types returned by the endpoint
-        
-        Returns:
-            list
-        
-```
----
-### `object()`
-
-```
-Returns the type of object it is
-        (card, error, etc)
-        
-        Returns:
-            string
-        
-```
----
-### `total_values()`
-
-```
-The number of items in `data()`
-        
-        Returns:
-            integer
-        
-```
----
-### `uri()`
-
-```
-The API URI for the endpoint you've called.
-        
-        Returns:
-            string
-        
-```

docs/scrython.catalog/KeywordAbilities.md

@@ -1,66 +0,0 @@
-# **class** `scrython.catalog.KeywordAbilities()`
-
-These docs will likely not be as detailed as the official Scryfall Documentation, and you should reference that for more information.
-
->In the event that a key isn't found or has been changed, you can access the full JSON output with the `scryfallJson` variable (`KeywordAbilities().scryfallJson`).
-
-## Args
-
-|arg|type|description|
-|:---:|:---:|:---:|
-
-## Returns
-N/A
-
-## Raises
-N/A
-
-## Examples
-```python
->>> catalog = scrython.catalog.KeywordAbilities() 
->>> catalog.data() 
-```
-
-## Methods
-
----
-### `data()`
-
-```
-A list of all types returned by the endpoint
-        
-        Returns:
-            list
-        
-```
----
-### `object()`
-
-```
-Returns the type of object it is
-        (card, error, etc)
-        
-        Returns:
-            string
-        
-```
----
-### `total_values()`
-
-```
-The number of items in `data()`
-        
-        Returns:
-            integer
-        
-```
----
-### `uri()`
-
-```
-The API URI for the endpoint you've called.
-        
-        Returns:
-            string
-        
-```

docs/scrython.catalog/KeywordActions.md

@@ -1,66 +0,0 @@
-# **class** `scrython.catalog.KeywordActions()`
-
-These docs will likely not be as detailed as the official Scryfall Documentation, and you should reference that for more information.
-
->In the event that a key isn't found or has been changed, you can access the full JSON output with the `scryfallJson` variable (`KeywordActions().scryfallJson`).
-
-## Args
-
-|arg|type|description|
-|:---:|:---:|:---:|
-
-## Returns
-N/A
-
-## Raises
-N/A
-
-## Examples
-```python
->>> catalog = scrython.catalog.KeywordActions() 
->>> catalog.data() 
-```
-
-## Methods
-
----
-### `data()`
-
-```
-A list of all types returned by the endpoint
-        
-        Returns:
-            list
-        
-```
----
-### `object()`
-
-```
-Returns the type of object it is
-        (card, error, etc)
-        
-        Returns:
-            string
-        
-```
----
-### `total_values()`
-
-```
-The number of items in `data()`
-        
-        Returns:
-            integer
-        
-```
----
-### `uri()`
-
-```
-The API URI for the endpoint you've called.
-        
-        Returns:
-            string
-        
-```

scrython/__init__.py

@@ -33,10 +33,6 @@ from scrython.catalog import Toughnesses
 from scrython.catalog import Watermarks
 from scrython.catalog import WordBank
 from scrython.catalog import ArtistNames
-from scrython.catalog import KeywordAbilities
-from scrython.catalog import KeywordActions
-from scrython.catalog import AbilityWords
-
 
 #Import symbology
 from scrython.symbology import ParseMana
@@ -81,7 +77,4 @@ __all__ = [
     'Symbology',
     'BulkData',
     'ScryfallError',
-    'KeywordAbilities',
-    'KeywordActions',
-    'AbilityWords'
 ]

scrython/catalog/__init__.py

@@ -11,9 +11,6 @@ from .toughnesses import Toughnesses
 from .watermarks import Watermarks
 from .word_bank import WordBank
 from .artist_names import ArtistNames
-from .keyword_abilities import KeywordAbilities
-from .keyword_actions import KeywordActions
-from .ability_words import AbilityWords
 
 __all__ = [
     'ArtifactTypes',
@@ -28,8 +25,5 @@ __all__ = [
     'Toughnesses',
     'Watermarks',
     'WordBank',
-    'ArtistNames',
+    'ArtistNames'
-    'KeywordAbilities',
-    'KeywordActions',
-    'AbilityWords'
 ]

scrython/catalog/ability_words.py

@@ -1,26 +0,0 @@
-from .catalogs_object import CatalogsObject
-
-
-class AbilityWords(CatalogsObject):
-    """
-    catalogs/ability-words
-
-    Catalog object for all known ability words
-
-    Args:
-        N/A
-
-    Returns:
-        N/A
-
-    Raises:
-        N/A
-
-    Examples:
-        >>> catalog = scrython.catalog.KeywordAbilities()
-        >>> catalog.data()
-    """
-
-    def __init__(self):
-        self._url = 'catalog/ability-words?'
-        super(AbilityWords, self).__init__(self._url)

scrython/catalog/keyword_abilities.py

@@ -1,26 +0,0 @@
-from .catalogs_object import CatalogsObject
-
-
-class KeywordAbilities(CatalogsObject):
-    """
-    catalog/keyword-abilities
-
-    Catalog object for all known keyword abilities
-
-    Args:
-        N/A
-
-    Returns:
-        N/A
-
-    Raises:
-        N/A
-
-    Examples:
-        >>> catalog = scrython.catalog.KeywordAbilities()
-        >>> catalog.data()
-    """
-
-    def __init__(self):
-        self._url = 'catalog/keyword-abilities?'
-        super(KeywordAbilities, self).__init__(self._url)

scrython/catalog/keyword_actions.py

@@ -1,26 +0,0 @@
-from .catalogs_object import CatalogsObject
-
-
-class KeywordActions(CatalogsObject):
-    """
-    catalog/keyword-actions
-
-    Catalog object for all known keyword actions
-
-    Args:
-        N/A
-
-    Returns:
-        N/A
-
-    Raises:
-        N/A
-
-    Examples:
-        >>> catalog = scrython.catalog.KeywordActions()
-        >>> catalog.data()
-    """
-
-    def __init__(self):
-        self._url = 'catalog/keyword-actions?'
-        super(KeywordActions, self).__init__(self._url)

setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 setup(
 	name='scrython',
 	packages=['scrython', 'scrython.cards', 'scrython.rulings', 'scrython.catalog', 'scrython.sets', 'scrython.symbology', 'scrython.bulk_data'],
-	version='1.11.0',
+	version='1.9.0',
 	description='A wrapper for using the Scryfall API.',
 	long_description='https://github.com/NandaScott/Scrython/blob/master/README.md',
 	url='https://github.com/NandaScott/Scrython',