Trying to fix Windows Python failures

.travis.yml

@@ -1,45 +1,38 @@
 language: c
 dist: bionic
 addons:
-  apt_packages:
-    - pandoc
+  apt:
+    packages:
+      - pandoc
 branches:
   only:
     - master
     - doc/sphinxdoc
-    - 0.11
+    - "0.11"
 os:
   - linux
-  - osx
   - windows
-osx_image: xcode11.3
+  - osx
+osx_image: xcode11.6
 env:
   jobs:
-    - PYTHON_VERSION="3.9.0"
-    - PYTHON_VERSION="2.7.18"
+    - PYTHON_VERSION="3.9.6"
+    - PYTHON_VERSION="3.8.10"
     - PYTHON_VERSION="3.7.9"
     - PYTHON_VERSION="3.6.8"
-    - PYTHON_VERSION="3.5.4"
-    - PYTHON_VERSION="3.8.6"
     - PYTHON_VERSION="3.10-dev"
-    - PYTHON_VERSION="pypy3.6-7.3.1"
-    - PYTHON_VERSION="pypy2.7-7.3.1"
-    - PYTHON_VERSION="pypy3.5-7.0.0"
+    - PYTHON_VERSION="3.11-dev"
+    - PYTHON_VERSION="pypy3.7-7.3.5"
+    - PYTHON_VERSION="pypy3.6-7.3.3"
   global:
     - DEPLOY_BRANCHES: "'master 0.11'"
-    - DEPLOY_PYTHONS: "'2.7.18 3.9.0'"
+    - DEPLOY_PYTHONS: "'3.9.6'"
     - DEPLOY_OSES: "'linux'"
     - PYB_ARGS: "'-E ci -v -X analyze install'"
     - TWINE_USERNAME: pybuilder-travis2
     - secure: D49QJr9Z4v9yz9VObFw0q44o2fy3YBjI48b6+Vb1qr2RNMF5GpVj+xWFTr9j1qMw7ilfwWCEKlHytKmh/OSOStUcd1vTlasGz8YefBCP8iIbvp9M6qcBKqMlp8f/6uxwUxak+OMvj5WuKwtyIUy8L9JwDxd02Q12MUW6SNtu2Lo=
 jobs:
   exclude:
-    - os: windows
-      env: PYTHON_VERSION="pypy2.7-7.3.1"
-    - os: windows
-      env: PYTHON_VERSION="pypy3.5-7.0.0"
-    - os: windows
-      env: PYTHON_VERSION="pypy3.6-7.3.1"
     - os: windows
       if: env(PYTHON_VERSION) =~ /^.+-dev$/
   allow_failures:
@@ -52,6 +45,8 @@ notifications:
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/3e07f25a6c20d8c6c172
-    on_cancel:  never # default: always
-install: travis_wait 30 python travis/travis_shim.py install
-script: travis_wait 60 python travis/travis_shim.py build
+    on_cancel: never # default: always
+install:
+  - travis_wait 30 python travis/travis_shim.py install
+script:
+  - travis_wait 60 python travis/travis_shim.py build

README.md

@@ -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/)
@@ -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
 

build.py

@@ -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.
 """
 
@@ -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"]
 
@@ -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",
@@ -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",

src/integrationtest/python/base_itest_support.py

@@ -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))

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()

src/integrationtest/python/smoke_clean_tests.py

@@ -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")