Browse Source

Make automated tests support running in Python 3.5.

Dan Helfman 7 years ago
parent
commit
71b1c3dfb0
5 changed files with 3 additions and 6 deletions
  1. 1 0
      NEWS
  2. 0 3
      README.md
  3. 0 1
      setup.py
  4. 1 1
      test_requirements.txt
  5. 1 1
      tox.ini

+ 1 - 0
NEWS

@@ -1,5 +1,6 @@
 1.2.9
 1.2.9
  * #102: Fix for syntax error that occurred in Python 3.5 and below.
  * #102: Fix for syntax error that occurred in Python 3.5 and below.
+ * Make automated tests support running in Python 3.5.
 
 
 1.2.8
 1.2.8
  * #73: Enable consistency checks for only certain repositories via "check_repositories" option in
  * #73: Enable consistency checks for only certain repositories via "check_repositories" option in

+ 0 - 3
README.md

@@ -445,9 +445,6 @@ cd borgmatic
 tox
 tox
 ```
 ```
 
 
-Note that while running borgmatic itself only requires Python 3+, running
-borgmatic's tests require Python 3.6+.
-
 If when running tests, you get an error from the
 If when running tests, you get an error from the
 [Black](https://black.readthedocs.io/en/stable/) code formatter about files
 [Black](https://black.readthedocs.io/en/stable/) code formatter about files
 that would be reformatted, you can ask Black to format them for you via the
 that would be reformatted, you can ask Black to format them for you via the

+ 0 - 1
setup.py

@@ -30,6 +30,5 @@ setup(
     },
     },
     obsoletes=['atticmatic'],
     obsoletes=['atticmatic'],
     install_requires=('pykwalify>=1.6.0,<14.06', 'ruamel.yaml>0.15.0,<0.16.0', 'setuptools'),
     install_requires=('pykwalify>=1.6.0,<14.06', 'ruamel.yaml>0.15.0,<0.16.0', 'setuptools'),
-    tests_require=('flexmock', 'pytest'),
     include_package_data=True,
     include_package_data=True,
 )
 )

+ 1 - 1
test_requirements.txt

@@ -1,7 +1,7 @@
 appdirs==1.4.3
 appdirs==1.4.3
 atomicwrites==1.2.1
 atomicwrites==1.2.1
 attrs==18.2.0
 attrs==18.2.0
-black==18.9b0
+black==18.9b0; python_version >= '3.6'
 Click==7.0
 Click==7.0
 coverage==4.5.1
 coverage==4.5.1
 docopt==0.6.2
 docopt==0.6.2

+ 1 - 1
tox.ini

@@ -8,7 +8,7 @@ deps = -rtest_requirements.txt
 commands =
 commands =
     py.test --cov-report term-missing:skip-covered --cov=borgmatic --ignore=tests/end-to-end \
     py.test --cov-report term-missing:skip-covered --cov=borgmatic --ignore=tests/end-to-end \
         tests []
         tests []
-    black --skip-string-normalization --line-length 100 --check .
+    - black --skip-string-normalization --line-length 100 --check .
     flake8 .
     flake8 .
 
 
 [testenv:black]
 [testenv:black]