summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/build.yml4
-rw-r--r--Makefile8
-rwxr-xr-xscripts/internal/download_wheels_appveyor.py2
3 files changed, 6 insertions, 8 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3a52c8fe..8a651a07 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -79,18 +79,22 @@ jobs:
uses: styfle/cancel-workflow-action@0.9.1
with:
access_token: ${{ github.token }}
+
- uses: actions/checkout@v3
+
- uses: actions/setup-python@v4
with:
python-version: "${{ matrix.python }}"
architecture: "${{ matrix.architecture }}"
cache: pip
cache-dependency-path: .github/workflows/build.yml
+
- name: Download wheels
uses: actions/download-artifact@v3
with:
name: wheels
path: wheelhouse
+
- name: Run tests
run: |
mkdir .tests
diff --git a/Makefile b/Makefile
index bdafabaf..a5ee28e2 100644
--- a/Makefile
+++ b/Makefile
@@ -256,13 +256,6 @@ sdist: ## Create tar.gz source distribution.
$(PYTHON) setup.py sdist
$(PYTHON) -m twine check dist/*.tar.gz
-upload-src: ## Upload source tarball on https://pypi.org/project/psutil/
- ${MAKE} sdist
- $(PYTHON) -m twine upload dist/*.tar.gz
-
-upload-wheels: ## Upload wheels in dist/* directory on PyPI.
- $(PYTHON) -m twine upload dist/*.whl
-
# --- others
check-sdist: ## Create source distribution and checks its sanity (MANIFEST)
@@ -293,6 +286,7 @@ pre-release: ## Check if we're ready to produce a new release.
assert 'XXXX' not in history, 'XXXX in HISTORY.rst';"
release: ## Create a release (down/uploads tar.gz, wheels, git tag release).
+ $(PYTHON) -m twine check dist/*
$(PYTHON) -m twine upload dist/* # upload tar.gz and Windows wheels on PyPI
${MAKE} git-tag-release
diff --git a/scripts/internal/download_wheels_appveyor.py b/scripts/internal/download_wheels_appveyor.py
index 786e23d8..d69ace62 100755
--- a/scripts/internal/download_wheels_appveyor.py
+++ b/scripts/internal/download_wheels_appveyor.py
@@ -28,7 +28,7 @@ from psutil._common import print_color
USER = "giampaolo"
PROJECT = "psutil"
BASE_URL = 'https://ci.appveyor.com/api'
-PY_VERSIONS = ['2.7', '3.7', '3.8', '3.9', '3.10']
+PY_VERSIONS = ['2.7']
TIMEOUT = 30