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: zimmermanncode/zcons
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.1rc0
Choose a base ref
...
head repository: zimmermanncode/zcons
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Apr 18, 2016

  1. updated requirements

    userzimmermann committed Apr 18, 2016
    Copy the full SHA
    e630481 View commit details
  2. Copy the full SHA
    5d00b52 View commit details
  3. Copy the full SHA
    eae3528 View commit details

Commits on Sep 19, 2018

  1. Copy the full SHA
    7639293 View commit details
  2. Copy the full SHA
    0397609 View commit details
  3. AutoUpdate setup.py

    userzimmermann committed Sep 19, 2018
    Copy the full SHA
    29ce104 View commit details
  4. Copy the full SHA
    370b402 View commit details

Commits on Aug 11, 2019

  1. Update requirements

    userzimmermann committed Aug 11, 2019
    Copy the full SHA
    65aee79 View commit details
  2. Update zetup config

    userzimmermann committed Aug 11, 2019
    Copy the full SHA
    6ae8bbc View commit details
  3. AutoUpdate setup

    userzimmermann committed Aug 11, 2019
    Copy the full SHA
    a45bcf3 View commit details
  4. Improve resolving of SCons package

    Keeping compatibility w/SCons 3.0.0 and 3.0.1, which still use
    the site-packages/scons-<version>/ dir instead of just scons/
    userzimmermann committed Aug 11, 2019
    Copy the full SHA
    4421ce5 View commit details
  5. Add tox+travis configs

    userzimmermann committed Aug 11, 2019
    Copy the full SHA
    596702b View commit details
  6. Copy the full SHA
    0d4e283 View commit details
  7. Copy the full SHA
    4b81106 View commit details
  8. Copy the full SHA
    92f0f09 View commit details
  9. Copy the full SHA
    5ce65f1 View commit details
  10. Copy the full SHA
    3b4f6ef View commit details
  11. Update requirements

    userzimmermann committed Aug 11, 2019
    Copy the full SHA
    23b5d71 View commit details
  12. Copy the full SHA
    e403fa4 View commit details
  13. Copy the full SHA
    567d3b0 View commit details
  14. Copy the full SHA
    3723887 View commit details
  15. Add appveyor CI config

    userzimmermann committed Aug 11, 2019
    Copy the full SHA
    abfe00c View commit details
  16. Copy the full SHA
    5394d73 View commit details
  17. Copy the full SHA
    d49175f View commit details
  18. Copy the full SHA
    69442ce View commit details
  19. Copy the full SHA
    6265a0a View commit details
  20. Copy the full SHA
    3b2601c View commit details
  21. Copy the full SHA
    c95e141 View commit details
  22. Copy the full SHA
    6561d59 View commit details
  23. Copy the full SHA
    59311e9 View commit details
  24. Copy the full SHA
    44c61ef View commit details
  25. Copy the full SHA
    abfde78 View commit details
  26. Copy the full SHA
    bb89de9 View commit details
  27. Add Hg tag 0.1.0

    userzimmermann committed Aug 11, 2019
    Copy the full SHA
    77c7ab5 View commit details
  28. Update requirements

    userzimmermann committed Aug 11, 2019
    Copy the full SHA
    895f3f8 View commit details
  29. Add Hg tag 0.1.1

    userzimmermann committed Aug 11, 2019
    Copy the full SHA
    ccbe40b View commit details
Showing with 301 additions and 131 deletions.
  1. +4 −0 .hgtags
  2. +71 −0 .travis.yml
  3. +100 −0 appveyor.yml
  4. +3 −1 requirements.txt
  5. +21 −75 setup.py
  6. +6 −0 tox.ini
  7. +72 −45 zcons/__init__.py
  8. +20 −9 zcons/error.py
  9. +4 −1 zetup.ini
4 changes: 4 additions & 0 deletions .hgtags
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
8285f0fc5a4e480b82b09e34ed64bffc496b1eeb 0.1rc0
e0ada7dc3d9b4bce5372616605f7fe761004d7dd 0.1rc1
44651ddedd71a9133be83cac5c8ef63df8d8dae9 0.1rc2
c8b056fcc5b78eee8d5f08fc823994109ee9ab0b 0.1.0
c79fd179da93bf9aba728e46a583ca22a574f5cc 0.1.1
71 changes: 71 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
sudo: false
git:
depth: false

language: python
python:
- '2.7'
- '3.5'
- '3.6'
- pypy

env:
- SCONS=SCons==3.0.1
- SCONS=

install:
- pip install -U pip setuptools six wheel
- pip install -U -e .
- pip install tox tox-travis

script:
- |
if [ ! -z "$SCONS" ] ; then
pip install "$SCONS"
fi
- |
python -c "$(cat << EOF
import os
import zcons
import SCons
assert zcons.SCONS.version == SCons.__version__
SCONS = os.environ.get('SCONS')
if not SCONS:
assert (
__import__('zetup.version').version.Version(
SCons.__version__
) >= '3.0.3')
else:
assert SCONS == "SCons==3.0.1"
assert (
__import__('zetup.version').version.Version(
SCons.__version__
) == '3.0.1')
EOF
)"
- tox -r -v

- pip uninstall --yes zcons
- pip install zetup[all]
- zetup install
# - zetup pytest
- zetup sdist
- zetup tox

deploy:
provider: pypi
user: userzimmermann
password:
secure: PSaF0STaBBt/rxcLymNEl1VlVQZ4SrNmdJRbhRZv9fiazTv2BYWGXK1N0qB1kGokpHzuDj3Jkboi50QrsuQxeRZ8NIhyT8tbOqGi9ZB1eLEOQGbsiceadA1O1fzo99/rE9HDKL7BHVDqJ9F60nd2vQXzCFsz0emy2tGteA5/MQ4tjP+uAq2KEzh4olO9Sc7IkEBwnbI9c9GaCYvq8jDfPUPzLuO+HlR6ZMlv8FOu9BT11OfhumNICfSe5T6sYa+i7F7oVSk+xxz0nr0MQEMjTwDi46fLkIF/vJukC9OfC4N6xTEP6pdIj7K4u3VlFcF+ZyCetI7zSj1k6Ki5m9gc38Tz+5hzHf/UjEoUXkJ91zbOFeCAKfUnoTPJf+P1EKkoNdLb1y95b6bY2D7rov2qpGHpofiUg5ACjQ+wnZcwRzGBkJHCR4oWHA4E1/dVBdAR7TZVw7a89XNVV3jgcgPtjA60MiEmsQ9pQibw00zk7/l1g8zKv+VRqzb1JlxDqwlEi7XN2V9xi4KJHGQRj3Xk6QInF0b6d7u3kq/lmAfUm64oiS23KfaxpjsLuDQL205cR8Th8c5/q3meear1iCk+7z5qS+noSCW2YfEqKKOUV+omfYAva2+xTtr4kSqt7ei6bC/A+MnOz1eMrtQitZpd8k/LjOLlKGnsDPPWdvZx+kw=
on:
python: '2.7'
condition: >
-z "$SCONS"
100 changes: 100 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
environment:
matrix:
-
PY: C:\Python27\python.exe
SCONS: SCons==3.0.1
-
PY: C:\Python27\python.exe

-
PY: C:\Python27-x64\python.exe
SCONS: SCons==3.0.1
-
PY: C:\Python27-x64\python.exe

-
PY: C:\Python35\python.exe
SCONS: SCons==3.0.1
-
PY: C:\Python35\python.exe

-
PY: C:\Python35-x64\python.exe
SCONS: SCons==3.0.1
-
PY: C:\Python35-x64\python.exe

-
PY: C:\Python36\python.exe
SCONS: SCons==3.0.1
-
PY: C:\Python36\python.exe

-
PY: C:\Python36-x64\python.exe
SCONS: SCons==3.0.1
-
PY: C:\Python36-x64\python.exe

-
PY: C:\Python37\python.exe
SCONS: SCons==3.0.1
-
PY: C:\Python37\python.exe

-
PY: C:\Python37-x64\python.exe
SCONS: SCons==3.0.1
-
PY: C:\Python37-x64\python.exe

build: off

install:
- cmd: |
%PY% -m pip install -U pip setuptools six wheel
%PY% -m pip install -U -e .
rem %PY% -m pip install -U tox
test_script:
- cmd: |
if defined SCONS ( %PY% -m pip install %SCONS% )
- ps: |
$test = @"
import os
import zcons
import SCons
assert zcons.SCONS.version == SCons.__version__
SCONS = os.environ.get('SCONS')
if not SCONS:
assert (
__import__('zetup.version').version.Version(
SCons.__version__
) >= '3.0.3')
else:
assert SCONS == 'SCons==3.0.1'
assert (
__import__('zetup.version').version.Version(
SCons.__version__
) == '3.0.1')
"@
$test | Out-File test-script.py -Encoding utf8
& cmd /c "%PY% test-script.py 2>&1"
- cmd: |
rem %PY% -m tox -r -v
- cmd: |
%PY% -m pip uninstall --yes zcons
%PY% -m pip install zetup[all]
%PY% -m zetup install
rem %PY% -m zetup pytest
%PY% -m zetup sdist
rem %PY% -m zetup tox
4 changes: 3 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
zetup >= 0.2.30
#py2 path.py ~= 11.5.0 #import path
#py3 path.py >= 11.5.0 #import path
zetup >= 0.2.60
96 changes: 21 additions & 75 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,75 +1,21 @@
# This file was auto-generated by zetup
#
# https://bitbucket.org/userzimmermann/zetup.py



from __future__ import print_function

import sys
import os
import re
try:
from setuptools import setup
except ImportError:
from distutils.core import setup


SETUP_REQUIRES = [
'zetup >= 0.2.30',

] + (os.path.exists('requirements.setup.txt')
and [line for line in map(str.strip, open('requirements.setup.txt'))
if line and not line.startswith('#')]
or []) + [
]


try:
from setuptools.dist import Distribution
from pkg_resources import get_distribution, working_set, \
DistributionNotFound, VersionConflict
except ImportError: # no setuptools
pass
else:
# make sure that setup requirements
# are always correctly resolved and accessible by:
# - pre-processing them one after another
# - recursively resolving their runtime requirements
# - moving any installed eggs to the front of sys.path
# - updating pkg_resources.working_set accordingly

installer = Distribution().fetch_build_egg

# don't pollute stdout
stdout = sys.__stdout__
sys.stdout = sys.__stdout__ = sys.__stderr__

def resolve(requirements, parent=None):
for req in requirements:
qualreq = parent and '%s->%s' % (req, parent) or req
print("Resolving setup requirement %s:" % qualreq)
try:
dist = get_distribution(req)
print(repr(dist))
except (DistributionNotFound, VersionConflict):
dist = installer(req)
sys.path.insert(0, dist.location)
working_set.entries.insert(0, dist.location)
working_set.by_key[dist.key] = dist
extras = re.match(r'[^#\[]*\[([^#\]]*)\]', req)
if extras:
extras = list(map(str.strip, extras.group(1).split(',')))
resolve(map(str, dist.requires(extras=extras or ())), qualreq)

resolve(SETUP_REQUIRES)
sys.stdout = sys.__stdout__ = stdout


dist = setup(

setup_requires=SETUP_REQUIRES,

use_zetup=True,

)
# This file was auto-generated by ZETUP
#
# Zimmermann's Extensible Tools for Unified Project setups
#
# https://github.com/zimmermanncode/zetup

from __future__ import print_function

from setuptools import setup


dist = None
try:
dist = setup(
setup_requires=["zetup >= 0.2.60"],

use_zetup=True,
)
finally:
if dist is not None and hasattr(dist, 'zetup_made'):
dist.zetup_made.clean()
6 changes: 6 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[tox]
envlist = py27,py35,py36,py37,pypy

[testenv]
commands =
python -c "import zcons; import SCons; assert zcons.SCONS.version == SCons.__version__"
Loading