Add integration tests

.editorconfig

@@ -11,10 +11,7 @@ insert_final_newline = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.toml]
-indent_size = 2
-
-[*.yaml]
+[*.{toml,yaml,yml}]
 indent_size = 2
 
 # Makefiles always use tabs for indentation

.github/workflows/ci.yml

@@ -0,0 +1,71 @@
+name: Continuous Integration and Deployment
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      max-parallel: 6
+      matrix:
+        python-version: [2.7, 3.5, 3.6, 3.7]
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          submodules: true
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Setup build and test environment
+        run: |
+          python -m pip install --upgrade "pip<19.2.0" setuptools wheel
+      - name: Build Python Package
+        run: |
+          python -m pip install -e ".[tests,virtualenv]"
+          python -m pip install -e tests/pytest-pypi
+          # Temporarily pin tomlkit to lower version dueto sdispater/tomlkit/issues/56.
+          python -m pip install --upgrade "tomlkit<=0.5.3"
+      - name: Lint with flake8
+        run: |
+          python -m pip install flake8
+          flake8 --show-source src/ tests/
+      - name: Test with pytest
+        run: |
+          pytest -n auto --cov=passa --cov-report=xml
+      - name: Report code coverage
+        env:
+          CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}
+        run: |
+          pip install codecov
+          coverage report
+          codecov
+
+  pack:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+      - name: Install Requirements
+        run: |
+          python -m pip install --upgrade "pip<19.2.0" check-manifest invoke
+          pip install -e ".[pack]"
+      - name: Check MANIFEST
+        run: |
+          check-manifest
+      - name: Packaging
+        run: |
+          invoke pack
+          python pack/passa.zip --help
+      - name: Upload packed result
+        uses: actions/upload-artifact@v1
+        with:
+          name: packed
+          path: pack/passa.zip

.gitignore

@@ -1,5 +1,5 @@
-/build
-/dist
+build/
+dist/
 /docs/_build
 /pack
 htmlcov/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "tests/pypi"]
+	path = tests/pypi
+	url = https://github.com/sarugaku/pipenv-test-artifacts.git

MANIFEST.in

@@ -12,6 +12,7 @@ recursive-include docs Makefile *.rst *.py *.bat
 recursive-exclude docs requirements*.txt
 
 prune .github
+prune .gitmodules
 prune docs/build
 prune news
 prune tasks

Pipfile

@@ -1,6 +1,7 @@
 [packages]
-passa = {editable = true,path = '.',extras = ['virtualenv']}
-
+passa = {editable = true,path = '.'}
+tomlkit = "<=0.5.3"
+yaspin = {file="https://github.com/sarugaku/yaspin/releases/download/v0.15.0post1/yaspin-0.15.0.post1-py2.py3-none-any.whl"}
 # Override sdist-only dependency via TOMLkit to fix build. (sarugaku/passa#61)
 [packages.functools32]
 file = """\

news/66.bugfix.rst

@@ -0,0 +1 @@
+Fix a bug that editable packages are not installed and locked properly.

news/66.feature.rst

@@ -0,0 +1,6 @@
+Improve the integration testing
+* Introduce ``pytest-pypi`` to mock the PyPI server for testing.
+* Refactor ``synchronizers.py`` to make it easy to mock installation and uninstallation operations.
+* Mock the VCS downloads for testing.
+* Improve the performance of metadata resolving by deduplicating the metasests items.
+* Switch to Github Pages as CI service.

news/67.bugfix.rst

@@ -0,0 +1 @@
+Fix a bug that ``strip_extras`` accidentally modifies the original requirement.

setup.cfg

@@ -37,8 +37,9 @@ python_requires = >=2.7,!=3.0,!=3.1,!=3.2,!=3.3
 setup_requires = setuptools>=36.2.2
 install_requires =
     appdirs
+    backports.functools_lru_cache; python_version <= "3.4"
     cached-property
-    distlib>=0.2.8
+    distlib
     installer
     packagebuilder
     packaging
@@ -61,6 +62,8 @@ tests =
     pytest-xdist
     pytest-timeout
     pytest-cov
+    pytest-mock
+    virtualenv
     pytest
 
 [options.entry_points]
@@ -95,7 +98,7 @@ ignore =
     # E231: missing whitespace after ','
     # E402: module level import not at top of file
     # E501: line too long
-    E231,E402,E501
+    E231,E402,E501,W503
 
 [tool:pytest]
 strict = true

src/passa/actions/clean.py

@@ -4,12 +4,14 @@
 
 
 def clean(project, default=True, dev=False, sync=True):
-    from passa.models.synchronizers import Cleaner
+    from passa.models.synchronizers import Synchronizer
     from passa.operations.sync import clean
 
-    cleaner = Cleaner(project, default=default, develop=dev, sync=sync)
+    syncer = Synchronizer(
+        project, default=default, develop=dev, clean_unneeded=True, dry_run=not sync
+    )
 
-    success = clean(cleaner)
+    success = clean(syncer)
     if not success:
         return 1
 

src/passa/actions/remove.py

@@ -27,11 +27,11 @@ def remove(project=None, only="default", packages=[], clean=True, sync=False):
     if not clean:
         return
 
-    from passa.models.synchronizers import Cleaner
+    from passa.models.synchronizers import Synchronizer
     from passa.operations.sync import clean
 
-    cleaner = Cleaner(project, default=True, develop=True)
-    success = clean(cleaner)
+    syncer = Synchronizer(project, default=True, develop=True, clean_unneeded=True)
+    success = clean(syncer)
     if not success:
         return 1
 

src/passa/actions/sync.py

@@ -10,7 +10,7 @@ def sync(project=None, dev=False, clean=True):
     project = project
     syncer = Synchronizer(
         project, default=True, develop=dev,
-        clean_unneeded=clean,
+        clean_unneeded=clean
     )
 
     success = sync(syncer)

src/passa/cli/add.py

@@ -21,7 +21,8 @@ def run(self, options):
             editables=options.editables,
             project=options.project,
             dev=options.dev,
-            clean=options.clean
+            clean=options.clean,
+            sync=options.sync
         )
 
 

src/passa/cli/install.py

@@ -15,7 +15,7 @@ class Command(BaseCommand):
 
     def run(self, options):
         return install(project=options.project, check=options.check, dev=options.dev,
-                            clean=options.clean)
+                       clean=options.clean)
 
 
 if __name__ == "__main__":

src/passa/cli/options.py

@@ -25,14 +25,14 @@ def __init__(self, root, *args, **kwargs):
         environment = kwargs.pop("environment", self.get_env())
         if not pipfile.is_file():
             raise argparse.ArgumentError(
-                "project", "{0!r} is not a Pipfile project".format(root),
+                None, "{0!r} is not a Pipfile project".format(root),
             )
         try:
             super(Project, self).__init__(root.as_posix(), environment=environment,
-                                            *args, **kwargs)
+                                          *args, **kwargs)
         except tomlkit.exceptions.ParseError as e:
             raise argparse.ArgumentError(
-                "project", "failed to parse Pipfile: {0!r}".format(str(e)),
+                None, "failed to parse Pipfile: {0!r}".format(str(e)),
             )
 
     def get_env(self):

src/passa/cli/remove.py

@@ -15,7 +15,7 @@ class Command(BaseCommand):
 
     def run(self, options):
         return remove(project=options.project, only=options.only,
-                        packages=options.packages, clean=options.clean, sync=options.sync)
+                      packages=options.packages, clean=options.clean, sync=options.sync)
 
 
 if __name__ == "__main__":

src/passa/cli/upgrade.py

@@ -14,7 +14,7 @@ class Command(BaseCommand):
 
     def run(self, options):
         return upgrade(project=options.project, strategy=options.strategy,
-                            sync=options.sync, packages=options.packages)
+                       sync=options.sync, packages=options.packages)
 
 
 if __name__ == "__main__":