working on it

.github/workflows/publish.yaml

@@ -11,11 +11,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/[email protected]
+        uses: actions/setup-python@v5
+      - name: Checkout
       - name: Install Poetry
-        uses: dschep/install-poetry-action@v1.2
+        uses: snok/install-poetry@v1.3.4
       - name: Publish
         env:
           POETRY_PYPI_TOKEN_PYPI: ${{ secrets.pypi_token }}

.github/workflows/tests.yaml

@@ -5,23 +5,53 @@ on:
   schedule:
     - cron: "1 1 1 * *"
 jobs:
+  lint:
+    name: Lint
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.8"
+      - name: Install Ruff
+        run: pip install ruff
+      - name: Run Tests
+        run: ruff
+  types:
+    name: Types
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.8"
+      - name: Install Poetry Action
+        uses: snok/[email protected]
+      - name: Install Dependencies
+        run: poetry install
+      - name: Run mypy
+        run: poetry run pytest
   test:
     name: Tests
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v1.1.1
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install Poetry
-        uses: dschep/install-poetry-action@v1.2
+      - name: Install Poetry Action
+        uses: snok/install-poetry@v1.3.4
       - name: Install Dependencies
-        run: poetry install -E pandas
+        run: poetry install
       - name: Run Tests
         run: poetry run pytest

.tool-versions

@@ -0,0 +1,2 @@
+poetry 1.7.1
+python 3.8.13

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wbdata"
-version = "0.3.0.post"
+version = "1.0.0.dev"
 description = "A library to access World Bank data"
 authors = ["Oliver Sherouse <[email protected]>"]
 license = "GPL-2.0+"
@@ -11,36 +11,56 @@ classifiers = [
     "Operating System :: OS Independent",
     "Topic :: Scientific/Engineering",
 ]
-
 repository = "https://github.com/OliverSherouse/wbdata"
 documentation = "https://wbdata.readthedocs.io/"
 keywords = ["World Bank", "data", "economics"]
 
 [tool.poetry.dependencies]
-python = ">=3.6"
-decorator = ">=4.0"
-requests = ">=2.0"
-tabulate = ">=0.8.5"
-appdirs = ">=1.4"
+python = "^3.8"
+requests = "^2.0"
+tabulate = "^0.8.5"
+appdirs = "^1.4"
 
-pandas = {version = ">=0.17", optional=true}
-sphinx = {version = "^3.0.3", optional=true}
-recommonmark = {version = "^0.6.0", optional=true}
-ipython = {version = "^7.16.1", optional=true}
+pandas = {version = ">=1,<3", optional=true}
+cachetools = "^5.3.2"
+shelved-cache = "^0.3.1"
+backoff = "^2.2.1"
+types-cachetools = "^5.3.0.7"
+dateparser = "^1.2.0"
+decorator = "^5.1.1"
 
 [tool.poetry.extras]
 pandas = ["pandas"]
-docs = ["sphinx", "recommonmark", "ipython"]
 
-[tool.poetry.dev-dependencies]
-pytest-flake8 = "^=1.0.6"
-ipython = "^=7.16.1"
-flake8-bugbear = "^20.1.4"
-sphinx = "^3.0.3"
-recommonmark = "^0.6.0"
-flake8 = "^3.8.3"
-pytest = "^5.4.3"
+[tool.poetry.group.dev.dependencies]
+ruff = "^0.1.11"
+pytest = "^7.4.4"
+mypy = "^1.8.0"
+types-tabulate = "^0.9.0.20240106"
+types-decorator = "^5.1.8.20240106"
+types-appdirs = "^1.4.3.5"
+types-requests = "^2.31.0.20240106"
+ipython = "<8"
+types-dateparser = "^1.1.4.20240106"
+mkdocs = "^1.5.3"
+mkdocstrings = "^0.24.0"
+
+[tool.ruff.lint]
+select = [
+    # pycodestyle
+    "E",
+    # Pyflakes
+    "F",
+    # pyupgrade
+    "UP",
+    # flake8-bugbear
+    "B",
+    # flake8-simplify
+    "SIM",
+    # isort
+    "I",
+]
 
 [build-system]
-requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"