Merge pull request #248 from adobe-apiplatform/v2

prepare for 2.2rc2 build

Author: adobeDan

Makefile

@@ -1,39 +1,27 @@
-USE_MISC_BUILD := no
-RM := rm -rf
+output_dir = dist
+output_filename = user-sync
+prebuilt_dir = external
 
 ifeq ($(OS),Windows_NT)
 	output_file_extension = .pex
 	rm_path := $(shell python -c "import distutils.spawn; print(distutils.spawn.find_executable('rm'))")
     ifeq ($(rm_path),None)
         RM := rmdir /S /Q
     endif
-	python_arch := $(shell python -c "import platform; print platform.architecture()[0]")
-    ifeq ($(python_arch),64bit)
-        misc_build_location := misc/build/Win64/
-        USE_MISC_BUILD := yes
-    endif
+else
+    output_file_extension = ""
+    RM := rm -rf
 endif
 
-output_dir = dist
-output_filename = user-sync
-
 pex:
 	pip install --upgrade pip
-	pip install pex requests wheel
+	pip install --upgrade wheel pex
 	-$(RM) $(output_dir)
-ifeq ($(USE_MISC_BUILD),yes)
-	pex \
-		-v -o $(output_dir)/$(output_filename)$(output_file_extension) -m user_sync.app \
-		-f $(misc_build_location) \
+	pex -v -o $(output_dir)/$(output_filename)$(output_file_extension) -m user_sync.app \
+		-f $(prebuilt_dir) \
 		--disable-cache \
 		--not-zip-safe .
 	-$(RM) wheelhouse
-else
-	pex \
-		-v -o $(output_dir)/$(output_filename)$(output_file_extension) -m user_sync.app \
-		--disable-cache \
-		--not-zip-safe .
-endif
 
 test:
 	nosetests --no-byte-compile tests

README.md

@@ -1,26 +1,32 @@
-# Release Notes for User Sync Tool Version 2.1.1
+# Release Notes for User Sync Tool Version 2.2
 
-These notes apply to v2.2rc1 of 2017-06-18.
+These notes apply to v2.2rc2 of 2017-06-26.
 
 ## New Features
 
-[#52](https://github.com/adobe-apiplatform/user-sync.py/issues/235): This release runs on both Python 2 and Python 3 (2.7, 3.4, 3.5, and 3.6 to be precise)!
+[#52](https://github.com/adobe-apiplatform/user-sync.py/issues/52): This release runs on both Python 2 and Python 3 (2.7, 3.4, 3.5, and 3.6 to be precise)!
 
-[#234](https://github.com/adobe-apiplatform/user-sync.py/issues/234): There are new UMAPI configuration settings (`timeout` and `retries` in the `server` section) to control the network behavior when talking to the UMAPI server.  The default timeout of 120 seconds and the default retry count of 3 are unchanged.
-
-[#182](https://github.com/adobe-apiplatform/user-sync.py/issues/182): At long last, you can select users in nested groups.  The new implementation also allows us to avoid fetching the entire directory when the users are only supposed to come from specific groups, as with `--users mapped` ([#129](https://github.com/adobe-apiplatform/user-sync.py/issues/129).
+[#182](https://github.com/adobe-apiplatform/user-sync.py/issues/182): At long last, you can select users in nested groups.  The new implementation also allows us to avoid fetching the entire directory when the users are only supposed to come from specific groups, as with `--users mapped` ([#129](https://github.com/adobe-apiplatform/user-sync.py/issues/129)).  There is a new LDAP setting `group_member_filter_format` which controls how users are selected for groups (default is the backward-compatible immediate members only).
 
 [#236](https://github.com/adobe-apiplatform/user-sync.py/issues/236): Directory users can now be pushed directly to Adobe, rather than synchronized with a fetch of Adobe users.  A new command-line argument `--strategy push` (as opposed to the default `--strategy sync`) controls this.
 
+[#234](https://github.com/adobe-apiplatform/user-sync.py/issues/234): There are new UMAPI configuration settings (`timeout` and `retries` in the `server` section) to control the network behavior when talking to the UMAPI server.  The default timeout of 120 seconds and the default retry count of 3 are unchanged.
+
 [#237](https://github.com/adobe-apiplatform/user-sync.py/issues/237): The default encoding for all inputs (config files, CSV files, LDAP attribute values) is now assumed to be `utf8` rather than ASCII.  This is a backward-compatible change that makes it unnecessary (but still allowed) to specify `utf8` explicitly.
 
 ## Bug Fixes
 
-This release contains bug fixes for:
+[#227](https://github.com/adobe-apiplatform/user-sync.py/issues/227): crashes due to bad user keys.
+
+[#233](https://github.com/adobe-apiplatform/user-sync.py/issues/233): exceptions in LDAP connections are handled gracefully, as are keyboard interrupts.
+
+[#235](https://github.com/adobe-apiplatform/user-sync.py/issues/235): crash if Adobe ID user has no username or domain info.
+
+[#240](https://github.com/adobe-apiplatform/user-sync.py/issues/240): When using the LDAP connector, the domain of each user is now correctly defaulted to the email domain.
+
+[#244](https://github.com/adobe-apiplatform/user-sync.py/issues/244): The build instructions are now provided for all platforms, and the default `Makefile` allows for the use of pre-compiled, platform-specific wheels.
 
-* [#227](https://github.com/adobe-apiplatform/user-sync.py/issues/227): crashes due to bad user keys.
-* [#235](https://github.com/adobe-apiplatform/user-sync.py/issues/235): crash if Adobe ID user has no username or domain info.
-* [#233](https://github.com/adobe-apiplatform/user-sync.py/issues/233): exceptions in LDAP connections are handled gracefully, as are keyboard interrupts.
+[#247](https://github.com/adobe-apiplatform/user-sync.py/issues/247): There is no more use of the `uid` attribute in LDAP directories.
 
 ## Compatibility with Prior Versions