Skip to content

Commit

Permalink
Merge 4990814 into master
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Oct 6, 2023
2 parents 29d42dd + 4990814 commit 71987ff
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 265 deletions.
59 changes: 22 additions & 37 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
python ./do.py test-pkg
to-staging:
needs: [test, build-exe]
needs: [ test, build-exe ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
Expand Down Expand Up @@ -131,50 +131,35 @@ jobs:
target_branch: master
github_token: ${{ github.token }}


to-pypi:
needs: [ to-master, pypi-flag ]
runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
#
# # ADD PYPI RELEASE
# - name: Set up Python
# uses: actions/setup-python@v4
# with:
# python-version: '3.x'
# - name: Install dependencies
# run: |
# python -m pip install --upgrade pip
# pip install setuptools wheel twine
# - name: Build and publish
# env:
# TWINE_USERNAME: ${{ secrets.PYPI_USR }}
# TWINE_PASSWORD: ${{ secrets.PYPI_PWD }}
# run: |
# python setup.py sdist bdist_wheel
# twine upload dist/*

# runs-on: ubuntu-latest

environment:
name: pypi
url: https://pypi.org/p/img2texture

permissions:
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
id-token: write # trusted publishing

steps:
- uses: actions/checkout@v4

- name: Set up Python # do we really need this?
uses: actions/setup-python@v4
with:
python-version: '3.x'
- name: Install dependencies # do we really need this?
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
python setup.py sdist bdist_wheel
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1

- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.x'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
python setup.py sdist bdist_wheel
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1


to-github-release:
needs: [ build-exe, to-staging, release-flag ]
Expand Down
185 changes: 0 additions & 185 deletions .github/workflows/ci.yml.bak

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/linux_build.yml.bak

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![PyPI version shields.io](https://img.shields.io/pypi/v/img2texture.svg)](https://pypi.python.org/pypi/img2texture/)
[![Generic badge](https://img.shields.io/badge/Python-3.7+-blue.svg)](#)
[![Generic badge](https://img.shields.io/badge/Python-3.8+-blue.svg)](#)
[![Generic badge](https://img.shields.io/badge/OS-Windows%20|%20macOS%20|%20Linux-blue.svg)](#)
[![Downloads](https://pepy.tech/badge/img2texture/month)](https://pepy.tech/project/img2texture)

Expand Down
2 changes: 1 addition & 1 deletion img2texture/_constants.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "1.1.2.post1"
__version__ = "1.1.2.post2"

__copyright__ = "(c) Arte:m iG <ortemeo@gmail.com>"
__license__ = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ def load_module_dict(filename: str) -> dict:
],

test_suite="test_unit.suite"
)
)

0 comments on commit 71987ff

Please sign in to comment.