sumpfork · sumpfork · Nov 15, 2021 · Nov 22, 2022 · Nov 22, 2022 · Dec 27, 2022
diff --git a/.flake8 b/.flake8
@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 120
+ignore = E203,W503,B006
diff --git a/.github/workflows/compile_card_db.yml b/.github/workflows/compile_card_db.yml
@@ -11,14 +11,15 @@ jobs:
  with:
  python-version: 3.8
  - run: |
- pip install -r requirements.txt
+ pip install poetry
+ poetry install
  pip install .
  - name: Update Languages
- run: doit update_languages
+ run: poetry run doit update_languages
  - run: |
  pip install .
  - name: test generation with compiled Languages
- run: pytest -k "test_languages"
+ run: poetry run pytest -k "test_languages"
  - uses: dorny/paths-filter@v2
  id: filter
  with:

diff --git a/.github/workflows/lint_and_test.yml b/.github/workflows/lint_and_test.yml
@@ -11,9 +11,9 @@ jobs:
  with:
  python-version: 3.8
  - run: |
- pip install -r requirements.txt
- pip install .
+ pip install poetry
+ poetry install
  - name: Lint
- run: pre-commit run --all-files
+ run: poetry run pre-commit run --all-files
  - name: Test
- run: pytest
+ run: poetry run tox
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,12 +15,11 @@ jobs:
  python-version: '3.x'
  - name: Install dependencies
  run: |
- python -m pip install --upgrade pip
- pip install setuptools wheel twine
+ pip install poetry
+ poetry install
  - name: Build and publish
  env:
- TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
- TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+ POETRY_HTTP_BASIC_PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
+ POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
  run: |
- python setup.py sdist bdist_wheel
- twine upload dist/*
+ poetry publish --build
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/dodo.py b/dodo.py
@@ -48,7 +48,7 @@ def task_build():
  files = [
  fname
  for fname in glob_no_dirs("src/domdiv/**/*")
- + glob.glob("card_db_src/**/*.json" + "setup.py")
+ + glob.glob("card_db_src/**/*.json")
  if os.path.isfile(fname)
  ]
  return {

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,4 +1,38 @@
-[build-system]
-requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.3", "pytest-runner"]
 
-[tools.setuptools_scm]
+[tool.poetry]
+name = "domdiv"
+version = "0.0.0"
+description = "Divider Generation for the Dominion Card Game"
+authors = ["Peter Gorniak <[email protected]>"]
+license = "MIT"
+homepage = "http://domdiv.bgtools.net"
+readme = "README.md"
+repository = "https:/sumpfork/dominiontabs"
+keywords = ["boardgame", "cardgame", "dividers"]
+
+[tool.poetry.scripts]
+dominion_dividers = 'domdiv.main:main'
+domdiv_update_language = 'domdiv.tools.update_language:run'
+domdiv_bgg_release = 'domdiv.tools.bgg_release:make_bgg_release'
+domdiv_dedupe_cards = 'domdiv.tools.cleanup_language_dupes:main'
+
+[tool.poetry.dependencies]
+python = "^3.7"
+Pillow = "^8.2.0"
+reportlab = "^3.5.67"
+ConfigArgParse = "^1.4.1"
+
+[tool.poetry.group.dev.dependencies]
+pre-commit = "^2.12.1"
+doit = "^0.33.1"
+
+[tool.poetry.group.test.dependencies]
+pytest = "^6.2.4"
+tox-poetry-installer = {extras = ["poetry"], version = "^0.10.3"}
+
+[tool.poetry-dynamic-versioning]
+enable = true
+
+[build-system]
+requires = ["poetry-core>=1.0.2", "poetry-dynamic-versioning"]
+build-backend = "poetry_dynamic_versioning.backend"
diff --git a/requirements.in b/requirements.in
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/tests/carddb_tests.py → tests/carddb_test.py b/tests/carddb_tests.py → tests/carddb_test.py
diff --git a/tests/generation_tests.py → tests/generation_test.py b/tests/generation_tests.py → tests/generation_test.py
diff --git a/tests/layout_tests.py → tests/layout_test.py b/tests/layout_tests.py → tests/layout_test.py
diff --git a/tests/text_tab_tests.py → tests/text_tab_test.py b/tests/text_tab_tests.py → tests/text_tab_test.py
diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist = py38
+isolated_build = true
 
 [testenv]
-deps = pytest
- pytest-flake8
+locked_deps = pytest
 commands = pytest