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

Release v1.6 #194

Merged
merged 57 commits into from Jan 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
4937277
Introduced new type field in sources.py to specify repo type (git, gi…
daniel-brosche Apr 14, 2018
cad2245
Introduced readonly git svn support
daniel-brosche Jun 12, 2018
04e5366
Cleaned up readonly git svn support
daniel-brosche Jun 24, 2018
75d6482
Merge branch 'develop-github-org' into feature/sources-type-svn-support
daniel-brosche Jun 26, 2018
6cff9f8
Added some documentation regarding setup and related use cases
daniel-brosche Jun 26, 2018
8b35fee
Fixed wrong merged git.fetch function
daniel-brosche Jun 26, 2018
f6a0c9d
Improved documentation regarding git-svn support and added entries in…
daniel-brosche Jun 26, 2018
ea06404
Disabled redefined-builtin in .pylint.ini
daniel-brosche Jun 27, 2018
cb47cab
Adapted gitman/tests according changed git module functions
daniel-brosche Jun 27, 2018
c405ac6
Adapted some more gitman/tests according changed git module functions
daniel-brosche Jun 27, 2018
21917a5
Fixed test_api.py related tests
daniel-brosche Jun 28, 2018
4d64950
Update coveragespace
jacebrowning Sep 10, 2018
2dddb77
Update Scrutinizer config
jacebrowning Sep 18, 2018
f5b93c6
Update dependencies
jacebrowning Oct 31, 2018
20791fa
Fixed test_models_source.py related tests
daniel-brosche Nov 5, 2018
6556217
Fixed test_git.py related tests
daniel-brosche Nov 5, 2018
69825fc
Merge branch 'develop' into feature/sources-type-svn-support
daniel-brosche Nov 5, 2018
cb131f2
Fixed sources.py related tests in due to merge last develop state
daniel-brosche Nov 5, 2018
6a9295e
Added pathlib2 to pipfile to improve development support for python 3…
daniel-brosche Nov 6, 2018
c41b1ac
Fixed pylint warnings
daniel-brosche Nov 7, 2018
24eb3d4
Merge pull request #168 from daniel-brosche/feature/sources-type-svn-…
jacebrowning Nov 9, 2018
0c59a92
Clean up formatting
jacebrowning Nov 9, 2018
9b9c715
Downgrade 'mkdocs' until content is ready
jacebrowning Nov 9, 2018
2fbf25b
Basic implementation to disable gitcache by set environment variable …
daniel-brosche Oct 29, 2018
da1d444
Reduced code duplication (concerning git.clone) and improved handling…
daniel-brosche Nov 29, 2018
05aa3d0
Added test to check git.clone with disabled gitcache (GITMAN_CACHE_DI…
daniel-brosche Nov 29, 2018
39468e7
Restore the cache setting even if the test fails
jacebrowning Nov 29, 2018
97b4b9b
Merge pull request #182 from daniel-brosche/feature/disable_gitman_cache
jacebrowning Nov 29, 2018
8b381c1
Update docs
jacebrowning Nov 29, 2018
eade916
Normalize paths for Windows
jacebrowning Nov 29, 2018
cb0c0c9
Bump version to 1.6a2
jacebrowning Nov 30, 2018
87486c2
Initial version of --skip-changes option
daniel-brosche Nov 30, 2018
d560169
Improved documentation
daniel-brosche Nov 30, 2018
4908600
Update wording
jacebrowning Nov 30, 2018
1fa09e4
Add add_mutually_exclusive_group for --force and --skip-changes
daniel-brosche Dec 1, 2018
fb5809a
Fix: --skip-changes should also be used recursively
daniel-brosche Dec 1, 2018
37d8e3c
Fix pylint issues
daniel-brosche Dec 1, 2018
57a9767
Skip locking for dependencies with uncommited changes (when --skip-ch…
daniel-brosche Dec 1, 2018
a02596f
Merge pull request #183 from daniel-brosche/feature/--skip-changes_op…
jacebrowning Dec 2, 2018
18b2e4d
Update docs
jacebrowning Dec 2, 2018
8b6f453
Update project tooling
jacebrowning Dec 25, 2018
99d0717
Update badges
jacebrowning Dec 25, 2018
4661023
Fix cyclic import
jacebrowning Dec 25, 2018
ca63e7b
Enable type checking
jacebrowning Dec 26, 2018
a258d24
Merge pull request #185 from jacebrowning/update-tooling
jacebrowning Dec 26, 2018
98a412d
Require Python 3.6+
jacebrowning Dec 26, 2018
e7d2661
Added skip-changes note to changelog
daniel-brosche Jan 11, 2019
ed3f6b8
Merge pull request #186 from daniel-brosche/feature/changelog_skip_ch…
jacebrowning Jan 11, 2019
aa3a536
Remove reference to source install
jacebrowning Jan 20, 2019
389d8a7
Create reproducible rev-parse dates
daniel-brosche Jan 21, 2019
2bb97ac
Bust AppVeyor cache via poetry lock
jacebrowning Jan 21, 2019
2e66394
Merge pull request #192 from jacebrowning/bust-appveyor-cache
jacebrowning Jan 21, 2019
2333565
Update mkdocs edit link
jacebrowning Jan 22, 2019
192a333
Fix typo
jacebrowning Jan 22, 2019
08579c2
Fix indentation after locking
jacebrowning Jan 26, 2019
f250d81
Bump version to 1.6
jacebrowning Jan 26, 2019
1a492cd
Add workaround for https://github.com/rtfd/readthedocs.org/issues/5090
jacebrowning Jan 26, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions .appveyor.yml
Expand Up @@ -2,15 +2,13 @@ environment:
global:
RANDOM_SEED: 0
matrix:
- PYTHON_MAJOR: 3
PYTHON_MINOR: 5
- PYTHON_MAJOR: 3
PYTHON_MINOR: 6
- PYTHON_MAJOR: 3
PYTHON_MINOR: 7

cache:
- .venv -> Pipfile.lock
- .venv -> poetry.lock

install:
# Add Make and Python to the PATH
Expand All @@ -19,7 +17,8 @@ install:
- set PATH=C:\Python%PYTHON_MAJOR%%PYTHON_MINOR%;%PATH%
- set PATH=C:\Python%PYTHON_MAJOR%%PYTHON_MINOR%\Scripts;%PATH%
# Install system dependencies
- pip install pipenv
- curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
- set PATH=%USERPROFILE%\.poetry\bin;%PATH%
- make doctor
# Install project dependencies
- make install
Expand Down
9 changes: 9 additions & 0 deletions .coveragerc
Expand Up @@ -2,6 +2,15 @@

branch = true

data_file = .cache/coverage

omit =
.venv/*
*/tests/*
*/__main__.py

[report]

exclude_lines =
pragma: no cover
raise NotImplementedError
7 changes: 5 additions & 2 deletions .isort.cfg
Expand Up @@ -2,12 +2,15 @@

not_skip = __init__.py

multi_line_output = 5
multi_line_output = 3

known_standard_library = dataclasses,typing_extensions
known_third_party = click,log
known_first_party = demo
known_first_party = gitman

combine_as_imports = true
force_grid_wrap = false
include_trailing_comma = true

lines_after_imports = 2
line_length = 88
7 changes: 7 additions & 0 deletions .mypy.ini
@@ -0,0 +1,7 @@
[mypy]

ignore_missing_imports = true
no_implicit_optional = true
check_untyped_defs = true

cache_dir = .cache/mypy/
9 changes: 0 additions & 9 deletions .pycodestyle.ini

This file was deleted.

7 changes: 5 additions & 2 deletions .pylint.ini
Expand Up @@ -125,6 +125,9 @@ disable=
too-many-branches,
keyword-arg-before-vararg,
logging-not-lazy,
redefined-builtin,
too-many-public-methods,
bad-continuation,

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down Expand Up @@ -268,7 +271,7 @@ indent-after-paren=4
indent-string=' '

# Maximum number of characters on a single line.
max-line-length=79
max-line-length=88

# Maximum number of lines in a module
max-module-lines=1000
Expand Down Expand Up @@ -313,7 +316,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=4
min-similarity-lines=6


[SPELLING]
Expand Down
1 change: 1 addition & 0 deletions .scrutinizer.yml
Expand Up @@ -2,6 +2,7 @@ build:
tests:
override:
- pylint-run --rcfile=.pylint.ini
- py-scrutinizer-run
nodes:
py35:
environment:
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
@@ -1,6 +1,5 @@
language: python
python:
- 3.5
- 3.6
matrix:
include:
Expand All @@ -11,14 +10,15 @@ matrix:
cache:
pip: true
directories:
- .venv
- ${VIRTUAL_ENV}

env:
global:
- RANDOM_SEED=0

before_install:
- pip install pipenv
- curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
- source $HOME/.poetry/env
- make doctor

install:
Expand Down
12 changes: 6 additions & 6 deletions .verchew.ini
Expand Up @@ -6,22 +6,22 @@ version = GNU Make
[Python]

cli = python
version = Python 3.
version = Python 3

[pipenv]
[Poetry]

cli = pipenv
versions = 10. | 11.
cli = poetry
version = 0.12

[Git]

cli = git
version = 2.
version = 2

[Graphviz]

cli = dot
cli_version_arg = -V
version = 2.
version = 2
optional = true
message = This is only needed to generate UML diagrams for documentation.
81 changes: 43 additions & 38 deletions CHANGELOG.md
@@ -1,94 +1,99 @@
# Revision History
# 1.6 (2019-01-26)

## 1.5 (2018-09-08)
- Added `git svn` support. (@daniel-brosche)
- Added `$GITMAN_CACHE_DISABLE` to disable repository mirrors. (@daniel-brosche)
- Added `--skip-changes` option to skip changed dependencies on install or update command. (@daniel-brosche)
- **BREAKING**: Dropped support for Python 3.5.

- Added `--keep-location` option on `uninstall` (@DavidWatkins).
# 1.5 (2018-09-08)

- Added `--keep-location` option on `uninstall`. (@DavidWatkins)
- Added feature to enable sparse checkouts. See the docs for further information. (@xenji)
- **BREAKING**: Removed confusing `--lock` option on `update` command in favor of just using the `lock` command.
- **BREAKING**: Renamed `--no-lock` to `--skip-lock` on `update` command.
- **BREAKING**: Renamed `--no-dirty` to `--fail-if-dirty` on `list` command.

## 1.4 (2017-03-21)
# 1.4 (2017-03-21)

- Allow config files to exist in subdirectories of the main project.
- Added `${GITMAN_CACHE}` to customize the repository cache location.
- Added `$GITMAN_CACHE` to customize the repository cache location.

## 1.3 (2017-02-03)
# 1.3 (2017-02-03)

- Added `init` command to generate sample config files.
- Added support for post-install scripts on dependencies.
- Updated config format to support `null` for links.

## 1.2 (2017-01-08)
# 1.2 (2017-01-08)

- Added preliminary Windows support (@StudioEtrange).
- Added preliminary Windows support. (@StudioEtrange)

## 1.1 (2017-01-06)
# 1.1 (2017-01-06)

- Added coloring to the command-line output.
- Fixed issue where `<dirty>` could be saved as a locked revision.

## 1.0.2 (2016-07-28)
# 1.0.2 (2016-07-28)

- Moved documentation to http://gitman.readthedocs.io/.

## 1.0.1 (2016-05-31)
# 1.0.1 (2016-05-31)

- Replaced calls to `git remote add origin` with `git remote set-url origin`.

## 1.0 (2016-05-22)
# 1.0 (2016-05-22)

- Initial stable release.

## 0.11 (2016-05-10)
# 0.11 (2016-05-10)

- Removed dependency on `sh` to support Cygwin/MinGW/etc. on Windows.
- Dropped Python 3.4 support for `subprocess` and `*args` improvements.
- **BREAKING**: Renamed config file key `dir` to `name`.

## 0.10 (2016-04-14)
# 0.10 (2016-04-14)

- Added `show` command to display dependency and internal paths.

## 0.9 (2016-03-31)
# 0.9 (2016-03-31)

- Added `edit` command to launch the config file.
- Depth now defaults to 5 to prevent infinite recursion.
- Fixed handling of source lists containing different dependencies.

## 0.8.3 (2016-03-14)
# 0.8.3 (2016-03-14)

- Renamed to GitMan.

## 0.8.2 (2016-02-24)
# 0.8.2 (2016-02-24)

- Updated to YORM v0.6.

## 0.8.1 (2016-01-21)
# 0.8.1 (2016-01-21)

- Added an error message when attempting to lock invalid repositories.

## 0.8 (2016-01-13)
# 0.8 (2016-01-13)

- Switched to using repository mirrors to speed up cloning.
- Disabled automatic fetching on install.
- Added `--fetch` option on `install` to always fetch.
- Now displaying `git status` output when there are changes.

## 0.7 (2015-12-22)
# 0.7 (2015-12-22)

- Fixed `git remote rm` command (@hdnivara).
- Fixed `git remote rm` command. (@hdnivara)
- Now applying the `update` dependency filter to locking as well.
- Now only locking previous locked dependencies.
- Added `lock` command to manually save all dependency versions.
- Now requiring `--lock` option on `update` to explicitly lock dependencies.

## 0.6 (2015-11-13)
# 0.6 (2015-11-13)

- Added the ability to filter the dependency list on `install` and `update`.
- Added `--depth` option to limit dependency traversal on `install`, `update`, and `list`.

## 0.5 (2015-10-20)
# 0.5 (2015-10-20)

- Added Git plugin support via: `git deps`.
- Removed `--no-clean` option (now the default) on `install` and `update`.
Expand All @@ -98,71 +103,71 @@
- Disabled warnings when running `install` without locked sources.
- Added `--no-lock` option to disable version recording.

## 0.4.2 (2015-10-18)
# 0.4.2 (2015-10-18)

- Fixed crash when running with some sources missing.

## 0.4.1 (2015-09-24)
# 0.4.1 (2015-09-24)

- Switched to cloning for initial working tree creation.

## 0.4 (2015-09-18)
# 0.4 (2015-09-18)

- Replaced `install` command with `update`.
- Updated `install` command to use locked dependency versions.
- Now sorting sources after a successful `update`.
- Now requiring `--force` to `uninstall` with uncommitted changes.
- Updated `list` command to show full shell commands.

## 0.3.1 (2015-09-09)
# 0.3.1 (2015-09-09)

- Ensures files are not needlessly reloaded with newer versions of YORM.

## 0.3 (2015-06-26)
# 0.3 (2015-06-26)

- Added `--no-clean` option to disable removing untracked files.
- Added support for `rev-parse` dates as the dependency `rev`.

## 0.2.5 (2015-06-15)
# 0.2.5 (2015-06-15)

- Added `--quiet` option to hide warnings.

## 0.2.4 (2015-05-19)
# 0.2.4 (2015-05-19)

- Now hiding YORM logging bellow warnings.

## 0.2.3 (2015-05-17)
# 0.2.3 (2015-05-17)

- Upgraded to YORM v0.4.

## 0.2.2 (2015-05-04)
# 0.2.2 (2015-05-04)

- Specified YORM < v0.4.

## 0.2.1 (2015-03-12)
# 0.2.1 (2015-03-12)

- Added automatic remote branch tracking in dependencies.
- Now requiring `--force` when there are untracked files.

## 0.2 (2015-03-10)
# 0.2 (2015-03-10)

- Added `list` command to display current URLs/SHAs.

## 0.1.4 (2014-02-27)
# 0.1.4 (2014-02-27)

- Fixed an outdated index when checking for changes.

## 0.1.3 (2014-02-27)
# 0.1.3 (2014-02-27)

- Fixed extra whitespace when logging shell output.

## 0.1.2 (2014-02-27)
# 0.1.2 (2014-02-27)

- Added `--force` argument to:
- overwrite uncommitted changes
- create symbolic links in place of directories
- Added live shell command output with `-vv` argument.

## 0.1 (2014-02-24)
# 0.1 (2014-02-24)

- Initial release.