Merge branch 'master' into unittest-mock

Author: charlch

.circleci/config.yml

@@ -8,7 +8,7 @@ test-tmpl: &test-tmpl
 
 job-tmpl: &job-tmpl
   machine:
-    image: ubuntu-1604:201903-01
+    image: ubuntu-2004:202010-01
 
   working_directory: ~/src
 
@@ -132,11 +132,6 @@ job-tmpl: &job-tmpl
 
 version: 2
 jobs:
-  py27:
-    <<: *job-tmpl
-    environment:
-      PYTHON: "python2.7"
-
   py35:
     <<: *job-tmpl
     environment:
@@ -169,13 +164,9 @@ workflows:
   version: 2
   pytest-plugins:
     jobs:
-      - py27
-      - py35
       - py36
       - py37
       - coveralls:
           requires:
-            - py27
-            - py35
             - py36
             - py37

install.sh

@@ -96,15 +96,16 @@ function init_venv {
 
 
 function update_apt_sources {
-  wget -qO- https://download.rethinkdb.com/apt/pubkey.gpg | apt-key add -
-  . /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | tee /etc/apt/sources.list.d/rethinkdb.list
+  wget -qO- https://download.rethinkdb.com/repository/raw/pubkey.gpg | apt-key add -
+  . /etc/lsb-release && echo "deb https://download.rethinkdb.com/repository/ubuntu-$DISTRIB_CODENAME $DISTRIB_CODENAME main" | tee /etc/apt/sources.list.d/rethinkdb.list
 
-  wget -q -O - https://pkg.jenkins.io/debian/jenkins-ci.org.key | apt-key add -
+  wget -q -O - https://pkg.jenkins.io/debian-stable/jenkins.io.key | apt-key add -
   sh -c 'echo deb http://pkg.jenkins.io/debian-stable binary/ > /etc/apt/sources.list.d/jenkins.list'
 
   apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
   echo "deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.4.list
 
+  apt install ca-certificates
   apt-get update
 }
 
@@ -137,7 +138,7 @@ function install_jenkins {
 }
 
 function install_mongodb {
-  apt-get install -y mongodb-org mongodb-org-server
+  apt-get install -y mongodb mongodb-server
 }
 
 function install_apache {

pytest-devpi-server/_pytest_devpi_server/__init__.py

@@ -121,9 +121,8 @@ def pre_setup(self):
             log.info("Extracting initial server data from {}".format(self.data))
             zipfile.ZipFile(self.data, 'r').extractall(self.server_dir)
         else:
-            self.run([sys.executable, '-c', 'import sys; from devpi_server.main import main; sys.exit(main())',
+            self.run([os.path.join(sys.exec_prefix, "bin", "devpi-init"),
                     '--serverdir', self.server_dir,
-                    '--init',
                     ])
 
 

pytest-devpi-server/tests/integration/test_devpi_server.py

@@ -6,6 +6,7 @@
         u"acl_upload": [u"testuser"],
         u"bases": [],
         u"mirror_whitelist": [],
+        u"mirror_whitelist_inheritance": u"intersection",
         u"projects": [],
         u"type": u"stage",
         u"volatile": True,

pytest-git/README.md

@@ -25,7 +25,7 @@ Here's a noddy test case that shows it working:
 ```python
 def test_git_repo(git_repo):
     # The fixture derives from `workspace` in `pytest-shutil`, so they contain 
-    # a handle to the path.py path object (see https://pathpy.readthedocs.io/)
+    # a handle to the path `path` object (see https://path.readthedocs.io/)
     path = git_repo.workspace
     file = path / 'hello.txt'
     file.write_text('hello world!')

pytest-profiling/pytest_profiling.py

@@ -17,7 +17,7 @@
 
 
 def clean_filename(s):
-    forbidden_chars = set('/?<>\:*|"')
+    forbidden_chars = set(r'/?<>\:*|"')
     return six.text_type("".join(c if c not in forbidden_chars and ord(c) < 127 else '_'
                                  for c in s))
 

pytest-pyramid-server/README.md

@@ -51,7 +51,7 @@ Here's a noddy test case showing the main functionality:
         # POST a document to the server.
         assert pyramid_server.post('/login', 'guest:password123').response_code == 200
 
-        # ``path.py`` path object to the running config file
+        # path ``path`` object to the running config file (see https://path.readthedocs.io/)
         assert pyramid_server.working_config.endswith('testing.ini')
 ```        
         

pytest-server-fixtures/README.md

@@ -115,7 +115,7 @@ All test fixtures share the following properties at runtime:
 | `hostname`  | Hostname that server is listening on
 | `port`      | Port number that the server is listening on
 | `dead`      | True/False: am I dead yet?
-| `workspace` | `path.py` object for the temporary directory the server is running out of
+| `workspace` | [`path`](https://path.readthedocs.io/) object for the temporary directory the server is running out of
 
 ## MongoDB
 

pytest-server-fixtures/pytest_server_fixtures/postgres.py

@@ -103,18 +103,22 @@ def run_cmd(self):
 
     def check_server_up(self):
         from psycopg2 import OperationalError
+        conn = None
         try:
             print("Connecting to Postgres at localhost:{}".format(self.port))
-            with self.connect('postgres') as conn:
-                conn.set_session(autocommit=True)
-                with conn.cursor() as cursor:
-                    cursor.execute("CREATE DATABASE " + self.database_name)
+            conn = self.connect('postgres')
+            conn.set_session(autocommit=True)
+            with conn.cursor() as cursor:
+                cursor.execute("CREATE DATABASE " + self.database_name)
             self.connection = self.connect(self.database_name)
             with open(self.workspace / 'db' / 'postmaster.pid', 'r') as f:
                 self.pid = int(f.readline().rstrip())
             return True
         except OperationalError as e:
             print("Could not connect to test postgres: {}".format(e))
+        finally:
+            if conn:
+                conn.close()
         return False
 
     def connect(self, database=None):

pytest-shutil/README.md

@@ -23,7 +23,7 @@ The workspace fixture is simply a temporary directory at function-scope with a f
     pytest_plugins = ['pytest_shutil']
 
     def test_something(workspace):
-        # Workspaces contain a handle to the path.py path object (see https://pathpy.readthedocs.io/)
+        # Workspaces contain a handle to the path `path` object (see https://path.readthedocs.io/)
         path = workspace.workspace         
         script = path / 'hello.sh'
         script.write_text('#!/bin/sh\n echo hello world!')