 Pedro Algarvio
|
0cbed99dc1
Merge branch '2017.7' into 2018.3
|
5 vuotta sitten |
|
Pedro Algarvio
|
cf86cbf6d0
Strings and integers are not comparable under Python 3
|
5 vuotta sitten |
|
Daniel A. Wozniak
|
0de189d272
Handle pipenv like version restrictions
|
6 vuotta sitten |
|
Ch3LL
|
82acce47cd
Handle encoding when opening file for both py2/py3
|
5 vuotta sitten |
|
Wayne Werner
|
cd310c2501
Set long_description
|
5 vuotta sitten |
|
Daniel A. Wozniak
|
9c6f65363e
Handle pipenv like version restrictions
|
6 vuotta sitten |
|
rallytime
|
68aabff0cf
Merge branch '2017.7' into '2018.3'
|
6 vuotta sitten |
|
Daniel Wallace
|
22cd4206c4
Merge pull request #48472 from gtmanfred/2017.7
|
6 vuotta sitten |
|
twangboy
|
935f9b560c
Fix dependencies
|
6 vuotta sitten |
|
Daniel Wallace
|
44aaac1d33
use tox to run pylint
|
6 vuotta sitten |
|
rallytime
|
a6533a9332
Merge branch '2017.7' into '2018.3'
|
6 vuotta sitten |
|
twangboy
|
4538b3abb3
Remove 'len-as-condition' disablement
|
6 vuotta sitten |
|
twangboy
|
d4efcc3c8b
Skip lint errors
|
6 vuotta sitten |
|
twangboy
|
1b3977f8d4
Remove m2crypto download for Windows
|
6 vuotta sitten |
|
twangboy
|
72cc361c7b
Move pytz to 3rd party import, add to __virtual__
|
6 vuotta sitten |
|
twangboy
|
eb3d45bb08
Remove installation of pywin32 from setup.py
|
6 vuotta sitten |
|
rallytime
|
fe2d46dd0c
Better merge conflict resolution for setup.py windows changes
|
6 vuotta sitten |
|
rallytime
|
8d1e1e7f94
Merge branch '2017.7' into '2018.3'
|
6 vuotta sitten |
|
twangboy
|
bcf8b19566
Update the installer build
|
6 vuotta sitten |
|
Erik Johnson
|
160dcc4ca0
Appease pylint
|
6 vuotta sitten |
|
Erik Johnson
|
61b90bc4bf
setup.py: Work around bad code in distutils
|
6 vuotta sitten |
|
Daniel Wallace
|
8ebf937b21
decode file list for setup.py on python2
|
6 vuotta sitten |
|
twangboy
|
c933f46c6a
Add check for pypiwin32 also
|
6 vuotta sitten |
|
twangboy
|
15317951fc
Update setup.py for new windows install
|
6 vuotta sitten |
|
twangboy
|
1ba89026b2
Consolidate req file
|
7 vuotta sitten |
|
rallytime
|
c0f16dae74
Merge branch '2017.7' into 'develop'
|
7 vuotta sitten |
|
rallytime
|
1d4a6c3949
Lint: Fixup undefined variable errors
|
7 vuotta sitten |
|
rallytime
|
788ad0609a
Merge branch '2016.11' into '2017.7'
|
7 vuotta sitten |
|
Pablo Suárez Hernández
|
44bc91bb98
Enable '--with-salt-version' parameter for setup.py script
|
7 vuotta sitten |
|
Gareth J. Greenaway
|
2cdd775ca8
Adding back in the salt-spm-reactor-dir
|
7 vuotta sitten |
