diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..113c822 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,26 @@ +name: Python Tests + +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.5, 3.6, 3.7, 3.8] + + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install pytest + if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + - name: Test with pytest + run: | + pytest diff --git a/scrython/bulk_data/bulk_data.py b/scrython/bulk_data/bulk_data.py index ec61638..d3c4478 100644 --- a/scrython/bulk_data/bulk_data.py +++ b/scrython/bulk_data/bulk_data.py @@ -5,6 +5,7 @@ import asyncio import aiohttp import urllib.parse from threading import Thread +import warnings class BulkData(FoundationObject): """ @@ -164,6 +165,10 @@ class BulkData(FoundationObject): return self.scryfallJson['data'][num]['compressed_size'] def bulk_permalink_uri(self, num): + warnings.warn("This method has been renamed to bulk_uri as per https://scryfall.com/blog/updates-to-bulk-data-and-cards-deprecation-notice-217", DeprecationWarning) + return self.bulk_uri(num) + + def bulk_uri(self, num): """The URL that hosts the bulk file Args: @@ -172,9 +177,9 @@ class BulkData(FoundationObject): Returns: string: A URI to download the compressed data """ - super(BulkData, self)._checkForTupleKey('data', num, 'permalink_uri') + super(BulkData, self)._checkForTupleKey('data', num, 'uri') - return self.scryfallJson['data'][num]['permalink_uri'] + return self.scryfallJson['data'][num]['uri'] def bulk_content_type(self, num): """The MIME type of the file diff --git a/unittests/__init__.py b/unittests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/unittests/TestBulk.py b/unittests/test_bulk.py similarity index 92% rename from unittests/TestBulk.py rename to unittests/test_bulk.py index c1a10c8..f6bcdfa 100644 --- a/unittests/TestBulk.py +++ b/unittests/test_bulk.py @@ -41,8 +41,8 @@ class TestBulk(unittest.TestCase): self.assertIsInstance(bulk.bulk_compressed_size(0), int) self.assertIsInstance(bulk.bulk_compressed_size(0, True), str) - def test_bulk_permalink_uri(self): - self.assertIsInstance(bulk.bulk_permalink_uri(0), str) + def test_bulk_uri(self): + self.assertIsInstance(bulk.bulk_uri(0), str) def test_bulk_content_type(self): self.assertIsInstance(bulk.bulk_content_type(0), str) diff --git a/unittests/TestCards.py b/unittests/test_cards.py similarity index 100% rename from unittests/TestCards.py rename to unittests/test_cards.py diff --git a/unittests/TestCatalog.py b/unittests/test_catalog.py similarity index 100% rename from unittests/TestCatalog.py rename to unittests/test_catalog.py diff --git a/unittests/TestRulings.py b/unittests/test_rulings.py similarity index 100% rename from unittests/TestRulings.py rename to unittests/test_rulings.py diff --git a/unittests/TestSets.py b/unittests/test_sets.py similarity index 100% rename from unittests/TestSets.py rename to unittests/test_sets.py diff --git a/unittests/TestSymbology.py b/unittests/test_symbology.py similarity index 100% rename from unittests/TestSymbology.py rename to unittests/test_symbology.py