Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix marker duplication #59

Merged
merged 36 commits into from
Sep 30, 2019
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
17fdda6
Add initial tests
techalchemy Sep 17, 2018
4186a0c
Clean up options and add virtualenv module
techalchemy Sep 18, 2018
c431ae6
Add tests (clean is still failing)
techalchemy Sep 18, 2018
bf4fa23
Wheel installation into virtualenv works
techalchemy Sep 18, 2018
ac6929b
Update setup.cfg
techalchemy Sep 18, 2018
194cd50
Implement working versions of clean and install inside virtualenvs
techalchemy Sep 19, 2018
8ee990e
Fix cleaning working set and messaging
techalchemy Sep 20, 2018
b1a7bf7
Fix tests
techalchemy Sep 27, 2018
2a40250
Update tox and add mork, installer and virtualenv dependencies
techalchemy Sep 27, 2018
afe8e51
Swap to mork implementation for testing
techalchemy Sep 28, 2018
28bf2f0
Update CI configs
techalchemy Sep 30, 2018
57bac36
Add deprecation warning ignores to test runners
techalchemy Sep 30, 2018
06f1af8
Add project fixtures, venv support
techalchemy Sep 30, 2018
7ed8fbe
Add clean, install and lock tests
techalchemy Sep 30, 2018
c5a516a
Add sync and remove tests
techalchemy Sep 30, 2018
d6e2aa4
Monkeypatch distlib metadata to work with version 2.1
techalchemy Oct 1, 2018
246eccd
Update lockfile
techalchemy Oct 1, 2018
1f48d03
Update pipfile and lockfile
techalchemy Oct 1, 2018
4dc19fd
Fix packing
techalchemy Oct 2, 2018
b1f2e17
Fix package task
techalchemy Sep 21, 2018
c47b7a6
Add LRU cache for cacheable function calls
techalchemy Sep 22, 2018
404b9e0
Drop markers from editable requirements
techalchemy Sep 22, 2018
0ffc28e
Add PySpec object to handle comparison and consolidation
techalchemy Sep 22, 2018
2345480
Cleanup
techalchemy Sep 23, 2018
82d3c70
Fix virtualenv usage and Set inheritance
techalchemy Sep 23, 2018
703c8c5
update lockfile?
techalchemy Sep 26, 2018
85de00e
Finalize marker intersection logic
techalchemy Sep 27, 2018
2c7f670
Clean up PySpec intersection methods
techalchemy Oct 2, 2018
3c9a86c
Force upgrades
techalchemy Oct 3, 2018
d26f485
Add assertion for debugging travis
techalchemy Oct 3, 2018
4d72b7a
Fix lru cache install
techalchemy Oct 3, 2018
18e6501
Fix specifier math
techalchemy Oct 4, 2018
fc759b3
Fix mork invocations
techalchemy Apr 8, 2019
e622517
Merge branch 'master' into fix-marker-duplication
techalchemy Apr 8, 2019
8024741
merge branch 'add-tests-frost'
Sep 30, 2019
bc0b1f4
merge conflicts
Sep 30, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 107 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,114 @@
.env
.venv
__pycache__

/build
/dist
/docs/_build
/pack
htmlcov/
.pytest_cache/
.vscode/

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

*.egg-info
# Distribution / packaging
.Python
develop-eggs/
downloads/
eggs/
.eggs/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

*.py[co]
# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/
.vscode/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does every PR has this. Maybe commit this first and base all PRs after it?

13 changes: 6 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ matrix:
fast_finish: true

install:
- "python -m pip install --upgrade pip pytest-timeout"
- "python -m pip install --upgrade -e .[tests]"
- "python -m pip install --upgrade --upgrade-strategy=eager pip setuptools pytest pytest-timeout pytest-cov pytest-xdist"
- "python -m pip install --upgrade --upgrade-strategy=eager -e .[tests,virtualenv]"
script:
- "python -m pytest -v -n 8 tests/"

Expand All @@ -24,22 +24,21 @@ jobs:
- stage: packaging
python: "3.6"
install:
- "python -m pip install --upgrade pip"
- "python -m pip install --upgrade pip setuptools"
- "python -m pip install --upgrade check-manifest readme-renderer"
script:
- "python setup.py check -m -r -s"
- stage: packing
python: "3.6"
install:
- "python -m pip install --upgrade -e .[pack]"
- "python -m pip install --upgrade --upgrade-strategy=eager -e .[pack]"
script:
- "invoke pack"
- "python2.7 pack/passa.zip --help"
- stage: coverage
python: "3.6"
install:
- "python -m pip install --upgrade pip"
- "python -m pip install --upgrade -e .[tests]"
- "python -m pip install --upgrade pytest-timeout pytest-xdist pytest-cov"
- "python -m pip install --upgrade --upgrade-strategy=eager pip setuptools pytest-timeout pytest-cov pytest-xdist"
- "python -m pip install --upgrade --upgrade-strategy=eager -e .[tests,virtualenv]"
script:
- "pytest -n auto --timeout 300 --cov=passa --cov-report=term-missing --cov-report=xml --cov-report=html tests"
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[packages]
passa = { editable = true, path = '.' }
passa = { editable = true, path = '.', extras = ['virtualenv'] }

[dev-packages]
black = '*'
Expand Down
Loading