Skip to content

Commit

Permalink
Merge pull request #760 from arcivanov/fix_travis_win_python
Browse files Browse the repository at this point in the history
Trying to fix Windows Python failures
  • Loading branch information
arcivanov committed Sep 3, 2021
2 parents 6ac1ef4 + af3043f commit 377ede6
Show file tree
Hide file tree
Showing 251 changed files with 33,771 additions and 3,248 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/pybuilder.yml
@@ -0,0 +1,35 @@
name: pybuilder
on:
- pull_request
- push
jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
- macos-latest
- windows-latest
python-version:
- '3.6'
- '3.7'
- '3.8'
- '3.9'
- '3.10.0rc1'
- 'pypy-3.6'
- 'pypy-3.7'
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
architecture: x64
- run: pwd
- run: python --version
- run: python -m pip --version
- shell: python # Prove that actual Python == expected Python
env:
EXPECTED_PYTHON: ${{ matrix.python-version }}
run: import os, sys ; assert sys.version.startswith(os.getenv("EXPECTED_PYTHON"))
57 changes: 0 additions & 57 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -3,7 +3,7 @@

[![Follow PyBuilder on Twitter](https://img.shields.io/twitter/follow/pybuilder_?label=Follow%20PyBuilder&style=social)](https://twitter.com/intent/follow?screen_name=pybuilder_)
[![Gitter](https://img.shields.io/gitter/room/pybuilder/pybuilder?logo=gitter)](https://gitter.im/pybuilder/pybuilder)
[![Build Status](https://img.shields.io/travis/pybuilder/pybuilder/master?logo=travis)](https://travis-ci.org/pybuilder/pybuilder)
[![Build Status](https://img.shields.io/travis/pybuilder/pybuilder/master?logo=travis)](https://app.travis-ci.com/github/pybuilder/pybuilder)
[![Coverage Status](https://img.shields.io/coveralls/github/pybuilder/pybuilder/master?logo=coveralls)](https://coveralls.io/r/pybuilder/pybuilder?branch=master)

[![PyBuilder Version](https://img.shields.io/pypi/v/pybuilder?logo=pypi)](https://pypi.org/project/pybuilder/)
Expand All @@ -19,9 +19,9 @@ PyBuilder is based on the concept of dependency based programming, but it also
comes with a powerful plugin mechanism, allowing the construction of build life
cycles similar to those known from other famous (Java) build tools.

PyBuilder is running on the following versions of Python: 2.7, 3.5, 3.6, 3.7, 3.8, 3.9 and PyPy 2.7, 3.5 and 3.6.
PyBuilder is running on the following versions of Python: 3.6, 3.7, 3.8, 3.9, 3.10 and PyPy 3.6 and 3.7.

See the [Travis Build](https://travis-ci.org/pybuilder/pybuilder) for version specific output.
See the [Travis Build](https://app.travis-ci.com/github/pybuilder/pybuilder) for version specific output.

## Installing

Expand Down
21 changes: 11 additions & 10 deletions build.py
Expand Up @@ -68,9 +68,9 @@
summary = "PyBuilder — an easy-to-use build automation tool for Python."
description = """PyBuilder — an easy-to-use build automation tool for Python.
PyBuilder is a software build automation tool written in pure Python mainly targeting Python ecosystem.
It is based on the concept of dependency-based programming but also comes along with powerful plugin mechanism that
allows the construction of build life-cycles similar to those known from other famous build tools like
PyBuilder is a software build automation tool written in pure Python mainly targeting Python ecosystem.
It is based on the concept of dependency-based programming but also comes along with powerful plugin mechanism that
allows the construction of build life-cycles similar to those known from other famous build tools like
Apache Maven and Gradle.
"""

Expand All @@ -91,9 +91,9 @@
"Documentation": "https://pybuilder.io/documentation"
}
license = "Apache License, Version 2.0"
version = "0.12.11.dev"
version = "0.13.0.dev"

requires_python = ">=2.7,!=3.0,!=3.1,!=3.2,!=3.3,!=3.4"
requires_python = ">=3.6"

default_task = ["analyze", "publish"]

Expand All @@ -107,13 +107,17 @@ def initialize(project):
project.set_property("vendorize_target_dir", "$dir_source_main_python/pybuilder/_vendor")
project.set_property("vendorize_packages", ["tblib~=1.5",
"tailer~=0.4",
"setuptools<45.0.0",
"virtualenv>16.0.0,<20.0.0",
"setuptools>=45.0.0",
"virtualenv>=20.0.0",
"importlib-resources>=1.0",
"importlib-metadata>=0.12",
"typing-extensions",
"colorama~=0.4.3"
])
project.set_property("vendorize_cleanup_globs", ["bin",
"setuptools",
"easy_install.py"])
project.set_property("vendorize_preserve_metadata", ["virtualenv*"])

project.set_property("coverage_break_build", False)
project.get_property("coverage_exceptions").extend(["pybuilder._vendor",
Expand Down Expand Up @@ -173,10 +177,7 @@ def initialize(project):
"Programming Language :: Python",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
Expand Down
2 changes: 1 addition & 1 deletion src/integrationtest/python/base_itest_support.py
Expand Up @@ -36,7 +36,7 @@ def setUp(self):
def tearDown(self):
outcomes = self.outcomes()
if self.tmp_directory and os.path.exists(self.tmp_directory) and not (outcomes[0] or outcomes[1]):
shutil.rmtree(self.tmp_directory)
shutil.rmtree(self.tmp_directory, ignore_errors=sys.platform in {"win32", "cygwin", "msys"})

def full_path(self, name):
name = os.path.normcase(os.path.normpath(name))
Expand Down
30 changes: 30 additions & 0 deletions src/integrationtest/python/smoke_clean_simple_tests.py
@@ -0,0 +1,30 @@
# -*- coding: utf-8 -*-
#
# This file is part of PyBuilder
#
# Copyright 2011-2020 PyBuilder Team
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import unittest

from smoke_itest_support import SmokeIntegrationTestSupport


class CleanSmokeSimpleTest(SmokeIntegrationTestSupport):
def test_clean(self):
self.smoke_test("-v", "-X", "clean")


if __name__ == "__main__":
unittest.main()
3 changes: 0 additions & 3 deletions src/integrationtest/python/smoke_clean_tests.py
Expand Up @@ -22,9 +22,6 @@


class CleanSmokeTest(SmokeIntegrationTestSupport):
def test_clean(self):
self.smoke_test("-v", "-X", "clean")

def test_build_then_clean(self):
self.smoke_test("-v", "-X", "compile_sources")
self.smoke_test("-v", "-X", "clean")
Expand Down

0 comments on commit 377ede6

Please sign in to comment.