1
0
mirror of https://github.com/getsops/sops.git synced 2026-02-05 12:45:21 +01:00
Commit Graph

254 Commits

Author SHA1 Message Date
Adrian Utrilla
39d871b30e Merge pull request #377 from rouge8/python-version-bump
[PYTHON] Bump to 1.18
2018-11-27 17:49:11 -05:00
Andy Freeland
3c1eb4da35 Bump to 1.18 2018-11-27 14:16:37 -08:00
Adrian Utrilla
f5ab22cce7 Merge pull request #399 from rouge8/py3-extract
[PYTHON] Fix --extract on Python 3
2018-11-27 17:09:24 -05:00
Andy Freeland
ca42e2a2e9 Add noqa comments for flake8 W605
W605 warns of invalid escape sequences in non-`r` strings.
Unfortunately, there's no Python 2/3 compatible way of marking `r`
bytestrings. `rb` is invalid on Python 2, and `r` is for text strings on
Python 3.
2018-11-27 13:49:47 -08:00
Andy Freeland
4f147d2ce6 Fix Python 2.6 compatibility 2018-11-27 11:06:13 -08:00
Andy Freeland
88f77253c6 Makefile debugging 2018-11-27 10:57:00 -08:00
Andy Freeland
0bf75c4b56 Fix --extract on Python 3
Previously, `--extract` would fail on Python 3:

```
Traceback (most recent call last):
  File "/Users/andy/.virtualenvs/sops-py3/bin/sops", line 11, in <module>
    load_entry_point('sops', 'console_scripts', 'sops')()
  File "/Users/andy/forks/sops/sops/__init__.py", line 278, in main
    write_file(tree, path=dest, filetype=otype)
  File "/Users/andy/forks/sops/sops/__init__.py", line 1321, in write_file
    sys.stdout.write(tree.encode('utf-8'))
TypeError: write() argument must be str, not bytes
```
2018-11-27 10:36:07 -08:00
Adrian Utrilla
21df5a6ba7 Merge pull request #372 from rouge8/python-ruamel.yaml-compatibility
[PYTHON] Fix compatibility with ruamel.yaml >= 0.15.52
2018-09-12 14:12:19 +02:00
Andy Freeland
517d4ac296 Copy Python 2.6 conditional ruamel.yaml requirement from setup.py 2018-08-20 16:54:16 -07:00
Andy Freeland
6de8815b7c Unpin dependencies in requirements.txt 2018-08-20 09:30:00 -07:00
Andy Freeland
3be8cb4129 [PYTHON] Fix compatibility with ruamel.yaml >= 0.15.52
ruamel.yaml 0.15.52 changed `CommentedMap` to no longer subclass
`OrderedDict` and 0.15.55 changed `CommentedSeq` to no longer subclass
`list`, which broke sops's logic for parsing YAML dicts vs lists.

This patch fixes that by checking `collections.abc.MutableMapping` and
`collections.abc.MutableSequence` instead.
2018-08-15 14:24:03 -07:00
Julien Vehent
34e58593e6 release 1.17 2018-04-19 17:38:51 -04:00
Julien Vehent [:ulfr]
5e9c9637f2 Merge pull request #333 from rouge8/unpin-python-dependencies
[PYTHON] Un-pin Python dependencies
2018-04-19 17:29:40 -04:00
Andy Freeland
18ee4d23ca Conditional ruamel.yaml dependencies to keep Python 2.6 support 2018-04-19 11:57:56 -07:00
Andy Freeland
2c6bc75cdb Un-pin Python dependencies 2018-04-17 16:02:04 -07:00
Julien Vehent [:ulfr]
c0746bc19e Merge pull request #319 from rouge8/fix-travis
[PYTHON] Fix Travis builds
2018-04-17 18:11:46 -04:00
Julien Vehent [:ulfr]
32ebbf409c Add unmaintained warning to python-sops, fixes #331 2018-04-17 11:27:21 -04:00
Andy Freeland
12bceb50ab Remove bare except: blocks
A recent pyflakes/flake8 complains about them.
2018-03-30 16:03:13 -07:00
Andy Freeland
cb9378b50c Drop unsupported xcode 7.1 2018-03-30 12:42:20 -07:00
Andy Freeland
ee9b514738 Drop EOL Ubuntu 12.04 from Travis 2018-03-30 12:40:25 -07:00
Andy Freeland
00189d5076 Cross-platform sha256 command 2018-03-30 12:34:21 -07:00
Andy Freeland
f8b348cc41 Fix Travis for OS X
`brew install gpg2` now fails since `gnupg` is already installed.
Instead, `brew upgrade gnupg`.
2017-07-26 08:30:35 -07:00
Julien Vehent
ce01c39ba3 release 1.16 1.16 2017-01-09 09:13:50 -05:00
Julien Vehent [:ulfr]
5629f4d356 Merge pull request #186 from dann7387/patch-1
Make sure GPG_EXEC is set before running GPG
2017-01-09 09:10:15 -05:00
Danny Cheung
cdb394affa Add second blank line at end of function 2017-01-09 09:24:12 +11:00
Danny Cheung
c4783bb2c2 Reduce line length of docstring 2017-01-09 09:24:12 +11:00
Danny Cheung
abbdb833d2 Make sure GPG_EXEC is set before running GPG
GPG_EXEC was only being set when run as a CLI tool.
It was not being set when used as a Python library.
2017-01-09 09:24:12 +11:00
Julien Vehent [:ulfr]
7ba688e62f Merge pull request #187 from mozilla/jvehent-patch-1
Don't install python via brew on osx
2017-01-06 14:48:59 -05:00
Julien Vehent
4e8f9680ea Install gnupg via brew 2017-01-06 12:20:51 -05:00
Julien Vehent [:ulfr]
6850c13620 Update .travis.yml 2016-12-29 21:20:08 -05:00
Julien Vehent [:ulfr]
966e89f120 Merge pull request #120 from twolfson/bug/value.to.stdout
Repaired trailing ellipses when outputting primitive values on stdout
2016-11-02 20:58:19 -04:00
Julien Vehent
fe0c0f1b8a Update version message 2016-11-02 20:55:27 -04:00
Todd Wolfson
d6870992dd Repaired trailing ellipses when outputting primitive values on stdout
Merge branch 'python-sops' into bug/value.to.stdout

Repaired trailing ellipses when outputting primitive values on stdout
2016-11-02 13:45:59 -07:00
Julien Vehent [:ulfr]
f10225368d Merge pull request #129 from mozilla/gui-editors
GUI editors in README
2016-10-26 15:04:17 -04:00
Adrian Utrilla
0671d1faf8 Wrapped lines, moved note below the code sample 2016-10-26 17:12:12 +02:00
Adrian Utrilla
12a1217286 Actually link to the issue 2016-10-26 16:24:01 +02:00
Adrian Utrilla
53e07f514d Update README.rst 2016-10-26 16:22:08 +02:00
Julien Vehent [:ulfr]
6385d101fc Merge pull request #121 from imsky/readme-extract-flag
fix README to use the correct extract subpath flag
2016-09-18 19:35:50 -04:00
Ivan Malopinsky
cf78a11fc3 fix README to use the correct extract subpath flag 2016-09-15 20:12:08 -04:00
Julien Vehent
fc5a78ee83 Update CHANGELOG to 1.14 2016-09-08 10:57:13 -04:00
Julien Vehent [:ulfr]
b0518966db Merge pull request #105 from mozilla/add-insert-flag
add --set flag
1.14
2016-09-08 10:42:22 -04:00
Julien Vehent
dab589f48b Merge branch 'add-insert-flag' of github.com:mozilla/sops into add-insert-flag 2016-09-07 18:31:29 -04:00
Julien Vehent
bfd962bd9e bump version 1.14 2016-09-07 18:31:24 -04:00
Daniel Thorn
44b54f1e20 fix naming collision 2016-09-07 11:27:51 -07:00
Daniel Thorn
51b4dd3550 change --insert to --set 2016-09-06 13:02:08 -07:00
Daniel Thorn
8a73c9579e change readme to --set 2016-09-06 13:00:22 -07:00
Daniel Thorn
7f9ae78387 Add --insert to readme 2016-09-02 13:48:42 -07:00
Daniel Thorn
3eb5e1df51 fix flake8 harder 2016-09-02 13:41:19 -07:00
Daniel Thorn
dd2ec16ed7 fix flake8 2016-09-02 13:31:43 -07:00
Daniel Thorn
6fa953b7a0 add --insert flag 2016-09-02 12:41:03 -07:00