Merge branch 'develop' into bugfix/64

Author: cmeissner

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        phpipam-version: ['1.4x', '1.5x']
+        phpipam-version: ['v1.4x', 'v1.5x']
         python-version: ['3.7.x', '3.8.x', '3.9.x', '3.10.x']
     steps:
       - uses: actions/checkout@v2

.github/workflows/stale.yml

@@ -0,0 +1,32 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '38 17 * * *'
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v8
+        with:
+          # issue setup
+          stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
+          close-issue-message: 'This issue was closed because it has been stalled for 5 days with no activity.'
+          exempt-issue-labels: 'accepted,enhancement,help wanted'
+          # pr setup
+          stale-pr-message: 'This PR is stale because it has been open 45 days with no activity. Remove stale label or comment'
+          exempt-pr-labels: 'help wanted,WIP'
+          days-before-pr-close: -1 # never close stale PRs
+          # deadlines config
+          days-before-stale: 30
+          days-before-close: 5

requirements-dev.txt

@@ -10,7 +10,5 @@ setuptools
 PyYAML
 bumpversion
 pytest
-pytest-replay
-pytest-vcr
 pytest-xdist
 coverage

tests/conftest.py

@@ -48,72 +48,3 @@ def find_all_test_cases():
 
 
 TEST_CASES = list(find_all_test_cases())
-
-
-def pytest_addoption(parser):
-    """Change command line options defaults.
-
-    We want run our tests only in three modes
-    `live` - interact with an existing API
-    `record` - interact with an existing API and record the interactions
-    `replay` - replay previouly recorded interactions with API
-
-    :param parser: A parser object
-    :type parser: object parser
-    """
-    parser.addoption(
-        "--vcrmode",
-        action="store",
-        default="replay",
-        choices=["replay", "record", "live"],
-        help="mode for vcr recording; one of ['replay', 'record', 'live']",
-    )
-
-
-@pytest.fixture
-def vcrmode(request):
-    """Return vcrmode of a request.
-
-    :param request: A request object
-    :type request: object request
-    :return: vcrmode
-    :rtype: str
-    """
-    return request.config.getoption("vcrmode")
-
-
-def cassette_name(test_name=None):
-    """Generate cassette_name."""
-    return 'tests/fixtures/{0}.yml'.format(test_name)
-
-
-FILTER_REQUEST_HEADERS = ['Authorization', 'Cookie', 'Token']
-FILTER_RESPONSE_HEADERS = ['Apipie-Checksum', 'Date', 'ETag', 'Server', 'Set-Cookie', 'Via', 'X-Powered-By', 'X-Request-Id', 'X-Runtime']
-
-
-def filter_response(response):
-    """Filter headers before recording.
-
-    :param response: A response object where we want to filter the headers from.
-    :type response: object response
-    :return: response
-    :rtype: object response
-    """
-    for header in FILTER_RESPONSE_HEADERS:
-        # headers should be case insensitive, but for some reason they weren't for me
-        response['headers'].pop(header.lower(), None)
-        response['headers'].pop(header, None)
-
-    return response
-
-
-def filter_request_uri(request):
-    """Filter uri before recording.
-
-    :param request: A request object where we want to filter the uri from.
-    :type request: object request
-    :return: request
-    :rtype: object request
-    """
-    request.uri = urlunparse(urlparse(request.uri)._replace(netloc="ipam.example.org"))
-    return request

tests/docker/docker-compose.yml

@@ -3,7 +3,7 @@ services:
   phpipam:
     image: "phpipam/phpipam-www:${PHPIPAM_VERSION:-v1.4.4}"
     ports:
-      - "${PHPIPAM_PORT:-443}:443"
+      - "${PHPIPAM_PORT:-8443}:443"
     environment:
       IPAM_DATABASE_HOST: "database"
       IPAM_DATABASE_USER: "phpipam"