Merge pull request #216 from rstudio/revert-212-kegs-content-subcommands

Revert "Add rsconnect content api subcommands"

Author: dbkegley

.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
       matrix:
         # TODO: work on windows-latest compatibility?
         os: [ubuntu-latest]
-        python-version: ['3.5', '3.6', '3.7', '3.8', '3.9']
+        python-version: ['2.7', '3.5', '3.6', '3.7', '3.8', '3.9']
         include:
         - os: macos-latest
           python-version: '3.9'
@@ -25,9 +25,9 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - run: pip install -r requirements.txt
     - run: pip freeze
-    - if: matrix.python-version != '3.5'
+    - if: matrix.python-version != '2.7' && matrix.python-version != '3.5'
       run: make fmt
-    - if: matrix.python-version != '3.5'
+    - if: matrix.python-version != '2.7' && matrix.python-version != '3.5'
       run: make lint
     - run: python setup.py --version
     - run: make test-${{ matrix.python-version }}
@@ -45,7 +45,7 @@ jobs:
     - run: make fmt
     - run: make lint
     - run: python setup.py --version
-    - run: make mock-test-3.8
+    - run: make test
   distributions:
     needs: test
     runs-on: ubuntu-latest

.gitignore

@@ -20,5 +20,3 @@ htmlcov
 /tests/testdata/**/rsconnect-python/
 /docs/docs/index.md
 /docs/docs/changelog.md
-/rsconnect-build
-/rsconnect-build-test

CHANGELOG.md

@@ -4,19 +4,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.7.0] - 2022-01-10
-
-### Added
-
-- Adds `rsconnect content` subcommands for interacting with RStudio Connect's `/v1/content`
-  REST API. This allows users to search, download, and (re)build content. Users should
-  note that the `rsconnect content build` subcommand requires RStudio Connect release 2021.11.1
-  or later.
-
-### Changed
-
-- Support for Python 2.7 has been removed in this release.
-
 ## [1.6.0] - 2021-08-30
 
 ### Added
@@ -45,7 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   rsconnect-python does not inspect the file contents to identify the object name, which must be
   one of the default names that Connect expects (`app`, `application`, `create_app`, or `make_app`).
 
-- Ability to hide code cells when rendering Jupyter notebooks.
+- Ability to hide code cells when rendering Jupyter notebooks. 
 
 After setting up Connect (>=1.9.0) and rsconnect-python, the user can render a Jupyter notebook without its corresponding code cells by passing the ' hide-all-input' flag through the rsconnect cli:
 

Makefile

@@ -26,19 +26,16 @@ endif
 ifneq ($(CONNECT_API_KEY),)
   TEST_ENV += CONNECT_API_KEY=$(CONNECT_API_KEY)
 endif
-ifneq ($(CONNECT_CONTENT_BUILD_DIR),)
-	TEST_ENV += CONNECT_CONTENT_BUILD_DIR=$(CONNECT_CONTENT_BUILD_DIR)
-endif
 
 # NOTE: See the `dist` target for why this exists.
 SOURCE_DATE_EPOCH := $(shell date +%s)
 export SOURCE_DATE_EPOCH
 
 .PHONY: all-tests
-all-tests: all-images test-3.5 test-3.6 test-3.7 test-3.8 test-3.9 test-3.10
+all-tests: all-images test-2.7 test-3.5 test-3.6 test-3.7 test-3.8
 
 .PHONY: all-images
-all-images: image-3.5 image-3.6 image-3.7 image-3.8 image-3.9 image-3.10
+all-images: image-2.7 image-3.5 image-3.6 image-3.7 image-3.8
 
 image-%:
 	docker build -t rsconnect-python:$* --build-arg BASE_IMAGE=python:$*-slim .
@@ -52,16 +49,15 @@ test-%:
 mock-test-%: clean-stores
 	@$(MAKE) -C mock_connect image up
 	@sleep 1
-	trap "$(MAKE) -C mock_connect down" EXIT; \
-	CONNECT_CONTENT_BUILD_DIR="rsconnect-build-test" \
-	CONNECT_SERVER="http://$(HOSTNAME):3939" \
-	CONNECT_API_KEY="0123456789abcdef0123456789abcdef" \
-	$(MAKE) test-$*
+	CONNECT_SERVER=http://$(HOSTNAME):3939 CONNECT_API_KEY=0123456789abcdef0123456789abcdef $(MAKE) test-$*
 	@$(MAKE) -C mock_connect down
 
 fmt-%:
 	$(RUNNER) 'black .'
 
+.PHONY: fmt-2.7
+fmt-2.7: .fmt-unsupported
+
 .PHONY: fmt-3.5
 fmt-3.5: .fmt-unsupported
 
@@ -82,6 +78,9 @@ lint-%:
 	$(RUNNER) 'flake8 rsconnect/'
 	$(RUNNER) 'mypy -p rsconnect'
 
+.PHONY: lint-2.7
+lint-2.7: .lint-unsupported
+
 .PHONY: lint-3.5
 lint-3.5: .lint-unsupported