Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixops
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 18fe72f9232a
Choose a base ref
...
head repository: NixOS/nixops
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8aa43c153bc2
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Nov 15, 2018

  1. fix import cycle 

    I was too confident this would have been catched by the unittests,
but as I learned most of those are require configured backends.
This time I used this nixops version to deploy my server.
    @Mic92
    Mic92 committed Nov 15, 2018
    Copy the full SHA
    3ae8078 View commit details

  2. nixops.deployments: use importlibs for dynamic imports 

    importlibs is wrapper around __import and harder to misuse.
    @Mic92
    Mic92 committed Nov 15, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    aefeb18 View commit details

  3. travis: enable build sandbox

    @Mic92
    Mic92 committed Nov 15, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eb86e16 View commit details

  4. Merge pull request #1046 from Mic92/fix-import-cycle 

    fix import cycle
    @domenkozar
    domenkozar authored Nov 15, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8aa43c1 View commit details
Showing with 15 additions and 6 deletions.
  1. +4 −1 .travis.yml
  2. +2 −1 nixops/deployment.py
  3. +4 −2 nixops/diff.py
  4. +5 −2 release.nix
5 changes: 4 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
language: nix
script: nix-build --quiet release.nix -A build.x86_64-linux
before_script:
- sudo mkdir /etc/nix && echo 'sandbox = true' | sudo tee /etc/nix/nix.conf
script:
- nix-build --quiet release.nix -A build.x86_64-linux
3 changes: 2 additions & 1 deletion nixops/deployment.py
View file
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@
from nixops.util import ansi_success
import inspect
import time
import importlib

class NixEvalError(Exception):
pass
@@ -1269,7 +1270,7 @@ def _create_state(depl, type, name, id):
def _load_modules_from(dir):
for module in os.listdir(os.path.dirname(__file__) + "/" + dir):
if module[-3:] != '.py' or module == "__init__.py": continue
__import__("nixops." + dir + "." + module[:-3], globals(), locals())
importlib.import_module("nixops." + dir + "." + module[:-3])

_load_modules_from("backends")
_load_modules_from("resources")
6 changes: 4 additions & 2 deletions nixops/diff.py
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@

from typing import Any, Callable, Optional, List, Dict, Union, AnyStr
import nixops.util
from nixops.deployment import Deployment
from nixops.logger import MachineLogger
from nixops.state import StateDict

@@ -19,7 +18,10 @@ class Diff(object):
UNSET = 2

def __init__(self,
depl, # type: Deployment
# FIXME: type should be 'nixops.deployment.Deployment'
# however we have to upgrade to python3 in order
# to solve the import cycle by forward declaration
depl,
logger, # type: MachineLogger
config, # type: Dict[str, Any]
state, # type: StateDict
7 changes: 5 additions & 2 deletions release.nix
View file
Original file line number Diff line number Diff line change
@@ -107,10 +107,13 @@ rec {

doCheck = true;

# We have to unset PYTHONPATH here since it will pick enum34 which collides
# with python3 own module. This can be removed when nixops is ported to python3.
postCheck = ''
# We have to unset PYTHONPATH here since it will pick enum34 which collides
# with python3 own module. This can be removed when nixops is ported to python3.
PYTHONPATH= mypy --cache-dir=/dev/null nixops
# smoke test
HOME=$TMPDIR $out/bin/nixops --version
'';

# Needed by libcloud during tests