Skip to content

Commit 67cdc53

Browse files
committed
Github actions
1 parent 3a02d4e commit 67cdc53

File tree

7 files changed

+123
-35
lines changed

7 files changed

+123
-35
lines changed

.github/workflows/build.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Build package
2+
3+
on:
4+
workflow_call:
5+
push:
6+
7+
jobs:
8+
build:
9+
name: Build
10+
runs-on: windows-latest
11+
steps:
12+
- uses: actions/checkout@master
13+
- name: Set up Python 3.10
14+
uses: actions/setup-python@v3
15+
with:
16+
python-version: "3.10"
17+
- name: Install pypa/build
18+
run: >-
19+
python -m
20+
pip install
21+
build
22+
pyinstaller
23+
--user
24+
- name: Build pypi and exe bundles
25+
run: powershell.exe bin\release.ps1
26+
- uses: actions/upload-artifact@master
27+
with:
28+
name: dist-exe
29+
path: dist.exe\
30+
- uses: actions/upload-artifact@master
31+
with:
32+
name: dist-pypi
33+
path: dist\

.github/workflows/publish.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Publish package to PyPi and Github
2+
3+
on:
4+
push:
5+
tags:
6+
- '[0-9]+.[0-9]+.[0-9]+-?*'
7+
8+
jobs:
9+
use-build:
10+
uses: ./.github/workflows/build.yml
11+
12+
publish:
13+
needs: use-build
14+
name: Publish
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/download-artifact@master
18+
with:
19+
name: dist-exe
20+
path: dist.exe/
21+
- uses: actions/download-artifact@master
22+
with:
23+
name: dist-pypi
24+
path: dist/
25+
- name: Publish to Test PyPi
26+
uses: pypa/gh-action-pypi-publish@master
27+
with:
28+
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
29+
repository_url: https://test.pypi.org/legacy/
30+
- name: Publish to PyPi
31+
uses: pypa/gh-action-pypi-publish@master
32+
with:
33+
password: ${{ secrets.PYPI_API_TOKEN }}
34+
- name: Publish to Github
35+
uses: "marvinpinto/[email protected]"
36+
with:
37+
repo_token: "${{ secrets.GITHUB_TOKEN }}"
38+
automatic_release_tag: "${{ github.ref_name }}"
39+
prerelease: false
40+
draft: true
41+
title: "DRAFT: Release version ${{ github.ref_name }}"
42+
files: |
43+
dist.exe/*
44+
dist/*

MANIFEST.in

Lines changed: 0 additions & 2 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
[![Build](https://github.com/clarkb7/RemoveWindowsLockScreenAds/actions/workflows/build.yml/badge.svg)](https://github.com/clarkb7/RemoveWindowsLockScreenAds/actions/workflows/build.yml)
12
[![PyPI version](https://badge.fury.io/py/RemoveWindowsLockScreenAds.svg)](https://badge.fury.io/py/RemoveWindowsLockScreenAds)
23

34
# Remove Windows lock screen ads/Spotlight Ads

release.ps1 renamed to bin/release.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ do_pyinstaller noconsole
1818
do_pyinstaller console
1919

2020
# Create pypi dist
21-
python setup.py sdist bdist_wheel
21+
python -m build --sdist --wheel --outdir dist/
2222

pyproject.toml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
[build-system]
2+
requires = [
3+
"setuptools >= 61.0",
4+
"pywin32",
5+
]
6+
build-backend = "setuptools.build_meta"
7+
8+
[tool.setuptools]
9+
packages = [
10+
"RemoveWindowsLockScreenAds",
11+
]
12+
13+
[project]
14+
name = "RemoveWindowsLockScreenAds"
15+
version = "0.4.3"
16+
authors = [
17+
{ name="Branden Clark", email="[email protected]" },
18+
]
19+
description = "Remove Windows lock screen ads/Spotlight ads while keeping the rotating Spotlight image backgrounds."
20+
readme = "README.md"
21+
license = { text="MIT" }
22+
requires-python = ">=3.7"
23+
dependencies = [
24+
"pywin32",
25+
]
26+
classifiers=[
27+
"Development Status :: 4 - Beta",
28+
"Operating System :: Microsoft :: Windows :: Windows 10",
29+
"Intended Audience :: End Users/Desktop",
30+
"License :: OSI Approved :: MIT License",
31+
"Natural Language :: English",
32+
"Programming Language :: Python :: 3 :: Only",
33+
"Topic :: Utilities",
34+
]
35+
keywords = [
36+
"windows-spotlight",
37+
"remove-ads",
38+
"windows-lockscreen",
39+
]
40+
41+
[project.urls]
42+
"Homepage" = "https://github.com/clarkb7/RemoveWindowsLockScreenAds"
43+
"Bug Tracker" = "https://github.com/clarkb7/RemoveWindowsLockScreenAds/issues"
44+

setup.py

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)