From a21bef6b4251faff821b94a0a22c9d0103527203 Mon Sep 17 00:00:00 2001 From: Cedric Young Date: Fri, 23 Aug 2024 08:37:36 -0700 Subject: [PATCH] revert changes --- .github/workflows/publish-test.yml | 15 ++++-------- poetry.lock | 38 +----------------------------- pyproject.toml | 4 ---- 3 files changed, 5 insertions(+), 52 deletions(-) diff --git a/.github/workflows/publish-test.yml b/.github/workflows/publish-test.yml index 614f14e5..f8346bae 100644 --- a/.github/workflows/publish-test.yml +++ b/.github/workflows/publish-test.yml @@ -22,20 +22,13 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.11' - - name: change package name for test.pypi.org since we don't have 'cucu' - run: | - sed -i "s|name = \"cucu\"|name = \"cucu-test\"|g" pyproject.toml - - name: build package + - name: Install depedencies run: | pip install poetry poetry install --no-ansi - poetry build -vvv - # - name: build package - # run: | - # python -m pip install poetry - # poetry install --no-ansi - # poetry add build - # poetry run python build -n + - name: build package + run: | + poetry build - name: publish to test.pypi.org uses: pypa/gh-action-pypi-publish@release/v1 with: diff --git a/poetry.lock b/poetry.lock index 14b3acdc..b9726601 100644 --- a/poetry.lock +++ b/poetry.lock @@ -170,31 +170,6 @@ d = ["aiohttp (>=3.7.4)", "aiohttp (>=3.7.4,!=3.9.0)"] jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] uvloop = ["uvloop (>=0.15.2)"] -[[package]] -name = "build" -version = "1.2.1" -description = "A simple, correct Python build frontend" -optional = false -python-versions = ">=3.8" -files = [ - {file = "build-1.2.1-py3-none-any.whl", hash = "sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4"}, - {file = "build-1.2.1.tar.gz", hash = "sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d"}, -] - -[package.dependencies] -colorama = {version = "*", markers = "os_name == \"nt\""} -importlib-metadata = {version = ">=4.6", markers = "python_full_version < \"3.10.2\""} -packaging = ">=19.1" -pyproject_hooks = "*" -tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} - -[package.extras] -docs = ["furo (>=2023.08.17)", "sphinx (>=7.0,<8.0)", "sphinx-argparse-cli (>=1.5)", "sphinx-autodoc-typehints (>=1.10)", "sphinx-issues (>=3.0.0)"] -test = ["build[uv,virtualenv]", "filelock (>=3)", "pytest (>=6.2.4)", "pytest-cov (>=2.12)", "pytest-mock (>=2)", "pytest-rerunfailures (>=9.1)", "pytest-xdist (>=1.34)", "setuptools (>=42.0.0)", "setuptools (>=56.0.0)", "setuptools (>=56.0.0)", "setuptools (>=67.8.0)", "wheel (>=0.36.0)"] -typing = ["build[uv]", "importlib-metadata (>=5.1)", "mypy (>=1.9.0,<1.10.0)", "tomli", "typing-extensions (>=3.7.4.3)"] -uv = ["uv (>=0.1.18)"] -virtualenv = ["virtualenv (>=20.0.35)"] - [[package]] name = "cattrs" version = "23.2.3" @@ -1288,17 +1263,6 @@ files = [ [package.extras] windows-terminal = ["colorama (>=0.4.6)"] -[[package]] -name = "pyproject-hooks" -version = "1.1.0" -description = "Wrappers to call pyproject.toml-based build backend hooks." -optional = false -python-versions = ">=3.7" -files = [ - {file = "pyproject_hooks-1.1.0-py3-none-any.whl", hash = "sha256:7ceeefe9aec63a1064c18d939bdc3adf2d8aa1988a510afec15151578b232aa2"}, - {file = "pyproject_hooks-1.1.0.tar.gz", hash = "sha256:4b37730834edbd6bd37f26ece6b44802fb1c1ee2ece0e54ddff8bfc06db86965"}, -] - [[package]] name = "pysocks" version = "1.7.1" @@ -1782,4 +1746,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = ">=3.8,<=3.13" -content-hash = "353bc9afa47487caa9ad4715730cd8897cc44caa9c6d7c3dcd689571583554b2" +content-hash = "2537817282c3e655b31c3123f4a3900cb73454e71771779b041362fcd474745f" diff --git a/pyproject.toml b/pyproject.toml index cdee4dd4..a7e83a0a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,9 +29,6 @@ include = [ { path = "CHANGELOG.md", format = "sdist" }, { path = "LICENSE", format = "sdist" }, ] -packages = [ # here since we had to change the name on test.pypi.org - { include = "cucu", from = "src" }, -] [tool.poetry.scripts] cucu = "cucu.cli:main" @@ -61,7 +58,6 @@ tabulate = "^0.9.0" tenacity = "^9.0.0" mpire = "^2.10.2" psutil = "^6.0.0" -build = "^1.2.1" [tool.poetry.group.dev.dependencies] bandit = "^1.7.7"