Skip to content

Commit

Permalink
Merge pull request #34 from gofrolist/dev
Browse files Browse the repository at this point in the history
fix: move from pipenv to poetry
  • Loading branch information
gofrolist authored Jan 6, 2024
2 parents baa3d39 + 8b49039 commit 75659b4
Show file tree
Hide file tree
Showing 7 changed files with 703 additions and 558 deletions.
16 changes: 11 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,22 @@ jobs:
setuptools \
wheel
- name: Install pipenv
- name: Install poetry
run: |
pip install \
--no-cache-dir \
--disable-pip-version-check \
pipenv
poetry
- name: Install Python modules
env:
POETRY_VIRTUALENVS_CREATE: false
run: |
pipenv install --deploy --dev --system
poetry install --no-cache --no-root --without dev
pip list
- name: Test generator.py
run: |
pip install --editable .
python mtglabels/generator.py --labels-per-sheet 30 --output-dir /tmp ice
snyk-python:
Expand Down Expand Up @@ -94,4 +95,9 @@ jobs:
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.PAT }}
run: npx semantic-release -p @semantic-release/commit-analyzer -p @semantic-release/release-notes-generator -p @semantic-release/github --branches main
run: |
npx semantic-release \
-p @semantic-release/commit-analyzer \
-p @semantic-release/release-notes-generator \
-p @semantic-release/github \
--branches main
9 changes: 5 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,20 @@ jobs:
setuptools \
wheel
- name: Install pipenv
- name: Install poetry
run: |
pip install \
--no-cache-dir \
--disable-pip-version-check \
pipenv
poetry
- name: Install Python modules
env:
POETRY_VIRTUALENVS_CREATE: false
run: |
pipenv install --deploy --dev --system
poetry install --no-cache --no-root --without dev
pip list
- name: Test generator.py
run: |
pip install --editable .
python mtglabels/generator.py --labels-per-sheet 30 --output-dir /tmp ice
18 changes: 0 additions & 18 deletions Pipfile

This file was deleted.

509 changes: 0 additions & 509 deletions Pipfile.lock

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ The script `generator.py` is a Python script to generate the printable labels.
It requires Python 3.6+ and has a few dependencies.

brew install cairo # Install vector graphics library
pip install pipenv # Install python dependency management tool
pipenv install # Install python dependencies
pip install poetry # Install python dependency management tool
poetry install # Install python dependencies
pip install --editable .
python mtglabels/generator.py # Creates SVG & PDF files in output/

Expand Down
669 changes: 669 additions & 0 deletions poetry.lock

Large diffs are not rendered by default.

36 changes: 16 additions & 20 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"

[project]
[tool.poetry]
name = "mtglabels"
version = "0.0.19"
description = "Magic: the Gathering Printable Set Label Generator"
readme = "README.md"
requires-python = ">=3.10"
authors = [
{name = "Evgenii Vasilenko", email = "gmrnsk@gmail.com"},
]
authors = ["Evgenii Vasilenko <gmrnsk@gmail.com>"]

dependencies = [
"jinja2==3.1.2",
"requests==2.31.0",
"cairosvg==2.7.1",
"markupsafe==2.1.3",
"pypdf2==3.0.1",
]
[tool.poetry.dependencies]
python = "^3.10"
jinja2 = "==3.1.2"
requests = "==2.31.0"
cairosvg = "==2.7.1"
markupsafe = "==2.1.3"
pypdf2 = "==3.0.1"
urllib3 = "==2.1.0"

[project.optional-dependencies]
dev = [
"black==23.11.0",
]
[tool.poetry.group.dev.dependencies]
black = "==23.12.1"

[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"

0 comments on commit 75659b4

Please sign in to comment.